From 46b7c9440cf85ef08b35c12447a4c1bb722a486e Mon Sep 17 00:00:00 2001 From: alichinese Date: Tue, 16 Sep 2025 10:58:03 +0800 Subject: [PATCH 1/2] bsp: adjust the BSP layer structure * the common layer should not reference the custom layer; instead, it should be the bbappend that references the specific custom recipe. Signed-off-by: alichinese --- bsp/meta-openeuler-bsp/conf/layer.conf | 9 +++++ .../qemu/recipes-kernel/files/cfg/xfce.cfg | 33 +++++++++++++++++++ .../recipes-kernel/linux-openeuler.bbappend | 1 + .../qemu/recipes-kernel/qemu-aarch64.inc | 1 + .../linux/{ok3568.inc => linux-ok3568.inc} | 0 .../linux/linux-openeuler.bbappend | 1 + .../{tspi-3566.inc => linux-tspi-3566.inc} | 0 .../recipes-kernel/linux/linux-openeuler.bb | 1 - 8 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 bsp/meta-openeuler-bsp/qemu/recipes-kernel/files/cfg/xfce.cfg create mode 100644 bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend create mode 100644 bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc rename bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/{ok3568.inc => linux-ok3568.inc} (100%) rename bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/{tspi-3566.inc => linux-tspi-3566.inc} (100%) diff --git a/bsp/meta-openeuler-bsp/conf/layer.conf b/bsp/meta-openeuler-bsp/conf/layer.conf index b54de198f18..73fc556d4a6 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/files/cfg/xfce.cfg b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/files/cfg/xfce.cfg new file mode 100644 index 00000000000..3dad172edb3 --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/files/cfg/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-openeuler.bbappend b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend new file mode 100644 index 00000000000..41eaa2a9a8f --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend @@ -0,0 +1 @@ +include recipes-kernel/linux/linux-${MACHINE}.inc diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc new file mode 100644 index 00000000000..659606b0556 --- /dev/null +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc @@ -0,0 +1 @@ +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'oe-xfce', 'file://config/arm64/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 e536c1086fe..04d8f4820a4 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 5437aef1a96..a7516dff44a 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\ -- Gitee From c02f161f3125e3e277e0d05d8dcf1a375229cc21 Mon Sep 17 00:00:00 2001 From: alichinese Date: Tue, 16 Sep 2025 14:20:20 +0800 Subject: [PATCH 2/2] qemu-aarch64: add qemu-aarch64 desktop graphical configuration * add qemu-aarch64 desktop graphical configuration Signed-off-by: alichinese --- .../qemu/recipes-kernel/linux-openeuler.bbappend | 1 - .../recipes-kernel/{files/cfg => linux/files/cfgs}/xfce.cfg | 0 .../qemu/recipes-kernel/linux/linux-openeuler.bbappend | 1 + .../{qemu-aarch64.inc => linux/linux-qemu-aarch64.inc} | 4 +++- 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend rename bsp/meta-openeuler-bsp/qemu/recipes-kernel/{files/cfg => linux/files/cfgs}/xfce.cfg (100%) create mode 100644 bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-openeuler.bbappend rename bsp/meta-openeuler-bsp/qemu/recipes-kernel/{qemu-aarch64.inc => linux/linux-qemu-aarch64.inc} (44%) diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend deleted file mode 100644 index 41eaa2a9a8f..00000000000 --- a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux-openeuler.bbappend +++ /dev/null @@ -1 +0,0 @@ -include recipes-kernel/linux/linux-${MACHINE}.inc diff --git a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/files/cfg/xfce.cfg b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/files/cfgs/xfce.cfg similarity index 100% rename from bsp/meta-openeuler-bsp/qemu/recipes-kernel/files/cfg/xfce.cfg rename to bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/files/cfgs/xfce.cfg 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 00000000000..8ebcc1e4d26 --- /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/qemu-aarch64.inc b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc similarity index 44% rename from bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc rename to bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc index 659606b0556..45d053ce326 100644 --- a/bsp/meta-openeuler-bsp/qemu/recipes-kernel/qemu-aarch64.inc +++ b/bsp/meta-openeuler-bsp/qemu/recipes-kernel/linux/linux-qemu-aarch64.inc @@ -1 +1,3 @@ -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'oe-xfce', 'file://config/arm64/xfce.cfg', '', d)}" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" + +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'oe-xfce', 'file://cfgs/xfce.cfg', '', d)}" -- Gitee