diff --git a/bsp/meta-openeuler-bsp/conf/layer.conf b/bsp/meta-openeuler-bsp/conf/layer.conf index b54de198f18eb552bd9f49b5ac4ba46e928f41fa..73fc556d4a6c9ad713495d3647351808ddf98df0 100644 --- a/bsp/meta-openeuler-bsp/conf/layer.conf +++ b/bsp/meta-openeuler-bsp/conf/layer.conf @@ -53,3 +53,12 @@ BBFILES_DYNAMIC += " \ meta-ti-bsp:${LAYERDIR}/ti/*/*/*.bb \ meta-ti-bsp:${LAYERDIR}/ti/*/*/*.bbappend \ " + +#enable .bb under qemu/ when exist meta-openeuler-bsp-qemu +BBFILES_DYNAMIC += " \ +openeuler:${LAYERDIR}/qemu/*/*/*.bb \ +openeuler:${LAYERDIR}/qemu/*/*/*.bbappend \ +" + +#enable find .inc under qemu/, included in .bb +BBPATH:append = ":${LAYERDIR}/qemu" diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/files/cfgs/xfce.cfg b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/files/cfgs/xfce.cfg new file mode 100644 index 0000000000000000000000000000000000000000..3dad172edb3366331d1ecf8daf1321255a49fdd9 --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/files/cfgs/xfce.cfg @@ -0,0 +1,33 @@ +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_DRM_BOCHS=y +CONFIG_VGA_CONSOLE=y +CONFIG_DUMMY_CONSOLE=y + +CONFIG_FB=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_DRM_QXL=y + +CONFIG_DRM_VMWGFX=y +CONFIG_DRM_VBOXVIDEO=y + +CONFIG_VT=y +CONFIG_VT_CONSOLE=y + +CONFIG_DRM_VGEM=y +CONFIG_DRM_VKMS=y +CONFIG_VIRTIO_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_USB=y +CONFIG_USB_MOUSE=y +CONFIG_USB_HID=y +CONFIG_USB_HIDDEV=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_XHCI_PLATFORM=y diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-openeuler.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..8ebcc1e4d2681a45326ca55aed7d6aebb9257ba5 --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-openeuler.bbappend @@ -0,0 +1 @@ +require recipes-kernel/linux/linux-${MACHINE}.inc diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc new file mode 100644 index 0000000000000000000000000000000000000000..45d053ce3264717957d7b51ceb89214ee8ced7ed --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:append := "${THISDIR}/files/:" + +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'oe-xfce', 'file://cfgs/xfce.cfg', '', d)}" diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-ok3568.inc similarity index 100% rename from bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc rename to bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-ok3568.inc diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-openeuler.bbappend index e536c1086fe2c2a6460254dc79a54e0d6fc25bb3..04d8f4820a423a1ca203c19d9bbc1cab73f03453 100644 --- a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-openeuler.bbappend +++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-openeuler.bbappend @@ -1,4 +1,5 @@ require recipes-kernel/linux/linux-rockchip.inc +include recipes-kernel/linux/linux-${MACHINE}.inc # add COMPATIBLE_MACHINE COMPATIBLE_MACHINE = "ok3568|tspi-3566|ryd-3568|ok3588|ok3399|orangepi4-lts|roc-rk3588s-pc|orangepi5" diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-tspi-3566.inc similarity index 100% rename from bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc rename to bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-tspi-3566.inc diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb index 5437aef1a967bfe90f5dd7e61a1c6ddf6a6e7a28..a7516dff44a85026ea439d9be15d023157f81bd3 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb @@ -3,7 +3,6 @@ require recipes-kernel/linux/linux-openeuler.inc # the machine with the suffix "inc". Each machine's configuration file can # specify its own variables. For example, for the machine "tspi-3566", when # setting the PV (process variable), it should be specified as follows: PV:tspi-3566. -include recipes-kernel/linux/${MACHINE}.inc COMPATIBLE_MACHINE= "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', '\ qemuarm64|qemux86|qemux86-64|qemu-aarch64|raspberrypi4-64|generic-x86-64\