From 2310f31c3485c439c86f49c43db124dcfbdd90f2 Mon Sep 17 00:00:00 2001 From: alichinese Date: Tue, 22 Jul 2025 17:30:37 +0800 Subject: [PATCH] raspberrypi: refactoring the raspberrypi layer * for a clearer representation of the SOC layer, the raspberrypi layer has been moved and consolidated under the bsp directory Signed-off-by: alichinese --- .oebuild/platform/raspberrypi4-64.yaml | 1 + bsp/meta-raspberrypi/conf/layer.conf | 14 ++++++++++++++ .../conf/machine}/openeuler-raspberrypi4-64.conf | 0 .../recipes-bsp/bootfiles/rpi-bootfiles.bbappend | 0 .../recipes-bsp/bootfiles/rpi-cmdline.bbappend | 0 .../recipes-bsp/bootfiles/rpi-config/config.txt | 0 .../recipes-bsp/bootfiles/rpi-config_git.bbappend | 0 .../recipes-bsp/grub/grub-bootconf_%.bbappend | 0 .../recipes-bsp/grub/grub-efi_%.bbappend | 0 .../recipes-bsp/grub/initrd.inc | 0 .../files/bcm2711-rpi-4-b-jailhouse.dts | 0 .../jailhouse-overlay/files/jailhouse-overlay.dts | 0 .../jailhouse-overlay/jailhouse-overlay.bb | 0 .../0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch | 0 .../recipes-bsp/uefi/files/COPYING.linux | 0 .../recipes-bsp/uefi/files/LICENCE.broadcom | 0 .../recipes-bsp/uefi/files/LICENCE.edk2 | 0 .../uefi/files/RPi4_UEFI_Firmware_v1.33.zip | Bin .../recipes-bsp/uefi/files/checksum | 0 .../recipes-bsp/uefi/rpi-tf-a.bb | 0 .../recipes-bsp/uefi/rpi-uefi.bb | 0 .../pi-bluetooth/pi-bluetooth_%.bbappend | 0 .../recipes-core/auto-expand-fs/auto-expand-fs.bb | 0 .../auto-expand-fs/files/init_resize.sh | 0 .../auto-expand-fs/files/resize2fs_once | 0 .../recipes-core/base-files/base-files_%.bbappend | 0 .../recipes-core/images/initrd-install.inc | 0 .../recipes-core/images/mcs.inc | 0 .../images/openeuler-image-mcs.bbappend | 0 .../images/openeuler-image-tiny.bbappend | 0 .../recipes-core/images/openeuler-image.bbappend | 0 .../recipes-core/images/raspberrypi4-64.inc | 0 .../recipes-core/images/rpi.inc | 0 .../packagegroups/packagegroup-base.bbappend | 0 .../packagegroups/packagegroup-core-boot.bbappend | 0 .../packagegroups/packagegroup-dsoftbus.bbappend | 0 .../recipes-core/udev/files/99-com.rules | 0 .../recipes-core/udev/udev-rules-rpi.bbappend | 0 .../bluez-firmware-rpidistro_%.bbappend | 0 .../linux-firmware-rpidistro-compat.bb | 0 .../linux-firmware-rpidistro_%.bbappend | 0 .../linux/files/enable_cpu_hotplug.patch | 0 .../recipes-kernel/linux/files/rpi4b.cfg | 0 .../recipes-kernel/linux/linux-openeuler-rpi.inc | 0 .../linux/linux-openeuler-rt.bbappend | 0 .../recipes-kernel/linux/linux-openeuler.bbappend | 0 .../recipes-kernel/lopper/lopper-ops.bbappend | 0 .../lopper/lops/lop-extract-uart5-for-zephyr.dts | 0 .../wic/sdimage-rpi.wks | 0 meta-openeuler/conf/distro/openeuler.conf | 2 +- meta-openeuler/conf/layer.conf | 6 ------ 51 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 bsp/meta-raspberrypi/conf/layer.conf rename bsp/{meta-openeuler-bsp/conf/machine/include => meta-raspberrypi/conf/machine}/openeuler-raspberrypi4-64.conf (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/bootfiles/rpi-bootfiles.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/bootfiles/rpi-cmdline.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/bootfiles/rpi-config/config.txt (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/bootfiles/rpi-config_git.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/grub/grub-bootconf_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/grub/grub-efi_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/grub/initrd.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/jailhouse-overlay/files/bcm2711-rpi-4-b-jailhouse.dts (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/jailhouse-overlay/files/jailhouse-overlay.dts (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/jailhouse-overlay/jailhouse-overlay.bb (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/COPYING.linux (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/LICENCE.broadcom (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/LICENCE.edk2 (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/RPi4_UEFI_Firmware_v1.33.zip (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/files/checksum (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/rpi-tf-a.bb (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-bsp/uefi/rpi-uefi.bb (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/auto-expand-fs/auto-expand-fs.bb (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/auto-expand-fs/files/init_resize.sh (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/auto-expand-fs/files/resize2fs_once (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/base-files/base-files_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/initrd-install.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/mcs.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/openeuler-image-mcs.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/openeuler-image-tiny.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/openeuler-image.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/raspberrypi4-64.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/images/rpi.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/packagegroups/packagegroup-base.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/packagegroups/packagegroup-core-boot.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/packagegroups/packagegroup-dsoftbus.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/udev/files/99-com.rules (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-core/udev/udev-rules-rpi.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro-compat.bb (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux/files/enable_cpu_hotplug.patch (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux/files/rpi4b.cfg (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux/linux-openeuler-rpi.inc (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux/linux-openeuler-rt.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/linux/linux-openeuler.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/lopper/lopper-ops.bbappend (100%) rename bsp/{meta-openeuler-bsp/raspberrypi => meta-raspberrypi}/recipes-kernel/lopper/lops/lop-extract-uart5-for-zephyr.dts (100%) rename bsp/{meta-openeuler-bsp => meta-raspberrypi}/wic/sdimage-rpi.wks (100%) diff --git a/.oebuild/platform/raspberrypi4-64.yaml b/.oebuild/platform/raspberrypi4-64.yaml index acd24492753..30d6754ae6d 100644 --- a/.oebuild/platform/raspberrypi4-64.yaml +++ b/.oebuild/platform/raspberrypi4-64.yaml @@ -9,3 +9,4 @@ repos: layers: - yocto-meta-raspberrypi + - yocto-meta-openeuler/bsp/meta-raspberrypi diff --git a/bsp/meta-raspberrypi/conf/layer.conf b/bsp/meta-raspberrypi/conf/layer.conf new file mode 100644 index 00000000000..3f7296e6f32 --- /dev/null +++ b/bsp/meta-raspberrypi/conf/layer.conf @@ -0,0 +1,14 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH =. "${LAYERDIR}:" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "raspberrypi-bsp" +BBFILE_PATTERN_raspberrypi-bsp = "^${LAYERDIR}/" +BBFILE_PRIORITY_raspberrypi-bsp = "25" + +LAYERSERIES_COMPAT_raspberrypi-bsp = "kirkstone" +#no bb file under meta-openeuler-bsp, set it to 1 to ignore "No bb files" warning +BBFILE_PATTERN_IGNORE_EMPTY_raspberrypi-bsp = "1" diff --git a/bsp/meta-openeuler-bsp/conf/machine/include/openeuler-raspberrypi4-64.conf b/bsp/meta-raspberrypi/conf/machine/openeuler-raspberrypi4-64.conf similarity index 100% rename from bsp/meta-openeuler-bsp/conf/machine/include/openeuler-raspberrypi4-64.conf rename to bsp/meta-raspberrypi/conf/machine/openeuler-raspberrypi4-64.conf diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend rename to bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bbappend b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bbappend rename to bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config/config.txt b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config/config.txt similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config/config.txt rename to bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config/config.txt diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend rename to bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/grub-bootconf_%.bbappend b/bsp/meta-raspberrypi/recipes-bsp/grub/grub-bootconf_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/grub-bootconf_%.bbappend rename to bsp/meta-raspberrypi/recipes-bsp/grub/grub-bootconf_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/grub-efi_%.bbappend b/bsp/meta-raspberrypi/recipes-bsp/grub/grub-efi_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/grub-efi_%.bbappend rename to bsp/meta-raspberrypi/recipes-bsp/grub/grub-efi_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/initrd.inc b/bsp/meta-raspberrypi/recipes-bsp/grub/initrd.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/grub/initrd.inc rename to bsp/meta-raspberrypi/recipes-bsp/grub/initrd.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/files/bcm2711-rpi-4-b-jailhouse.dts b/bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/files/bcm2711-rpi-4-b-jailhouse.dts similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/files/bcm2711-rpi-4-b-jailhouse.dts rename to bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/files/bcm2711-rpi-4-b-jailhouse.dts diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/files/jailhouse-overlay.dts b/bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/files/jailhouse-overlay.dts similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/files/jailhouse-overlay.dts rename to bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/files/jailhouse-overlay.dts diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/jailhouse-overlay.bb b/bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/jailhouse-overlay.bb similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/jailhouse-overlay/jailhouse-overlay.bb rename to bsp/meta-raspberrypi/recipes-bsp/jailhouse-overlay/jailhouse-overlay.bb diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/0001-RPI3-RPI4-revert-rpi3_pwr_down_wfi.patch diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/COPYING.linux b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/COPYING.linux similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/COPYING.linux rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/COPYING.linux diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/LICENCE.broadcom b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/LICENCE.broadcom similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/LICENCE.broadcom rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/LICENCE.broadcom diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/LICENCE.edk2 b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/LICENCE.edk2 similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/LICENCE.edk2 rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/LICENCE.edk2 diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/RPi4_UEFI_Firmware_v1.33.zip b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/RPi4_UEFI_Firmware_v1.33.zip similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/RPi4_UEFI_Firmware_v1.33.zip rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/RPi4_UEFI_Firmware_v1.33.zip diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/checksum b/bsp/meta-raspberrypi/recipes-bsp/uefi/files/checksum similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/files/checksum rename to bsp/meta-raspberrypi/recipes-bsp/uefi/files/checksum diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb b/bsp/meta-raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb rename to bsp/meta-raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-uefi.bb b/bsp/meta-raspberrypi/recipes-bsp/uefi/rpi-uefi.bb similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-uefi.bb rename to bsp/meta-raspberrypi/recipes-bsp/uefi/rpi-uefi.bb diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend b/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend rename to bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb b/bsp/meta-raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb rename to bsp/meta-raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/files/init_resize.sh b/bsp/meta-raspberrypi/recipes-core/auto-expand-fs/files/init_resize.sh similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/files/init_resize.sh rename to bsp/meta-raspberrypi/recipes-core/auto-expand-fs/files/init_resize.sh diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/files/resize2fs_once b/bsp/meta-raspberrypi/recipes-core/auto-expand-fs/files/resize2fs_once similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/files/resize2fs_once rename to bsp/meta-raspberrypi/recipes-core/auto-expand-fs/files/resize2fs_once diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/base-files/base-files_%.bbappend b/bsp/meta-raspberrypi/recipes-core/base-files/base-files_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/base-files/base-files_%.bbappend rename to bsp/meta-raspberrypi/recipes-core/base-files/base-files_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/initrd-install.inc b/bsp/meta-raspberrypi/recipes-core/images/initrd-install.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/initrd-install.inc rename to bsp/meta-raspberrypi/recipes-core/images/initrd-install.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc b/bsp/meta-raspberrypi/recipes-core/images/mcs.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc rename to bsp/meta-raspberrypi/recipes-core/images/mcs.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend b/bsp/meta-raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend rename to bsp/meta-raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend b/bsp/meta-raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend rename to bsp/meta-raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend b/bsp/meta-raspberrypi/recipes-core/images/openeuler-image.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend rename to bsp/meta-raspberrypi/recipes-core/images/openeuler-image.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc b/bsp/meta-raspberrypi/recipes-core/images/raspberrypi4-64.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc rename to bsp/meta-raspberrypi/recipes-core/images/raspberrypi4-64.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc b/bsp/meta-raspberrypi/recipes-core/images/rpi.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc rename to bsp/meta-raspberrypi/recipes-core/images/rpi.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend rename to bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend rename to bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-dsoftbus.bbappend b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-dsoftbus.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-dsoftbus.bbappend rename to bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-dsoftbus.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/files/99-com.rules b/bsp/meta-raspberrypi/recipes-core/udev/files/99-com.rules similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/files/99-com.rules rename to bsp/meta-raspberrypi/recipes-core/udev/files/99-com.rules diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend rename to bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_%.bbappend b/bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_%.bbappend rename to bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro-compat.bb b/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro-compat.bb similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro-compat.bb rename to bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro-compat.bb diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend b/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend rename to bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/files/enable_cpu_hotplug.patch b/bsp/meta-raspberrypi/recipes-kernel/linux/files/enable_cpu_hotplug.patch similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/files/enable_cpu_hotplug.patch rename to bsp/meta-raspberrypi/recipes-kernel/linux/files/enable_cpu_hotplug.patch diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/files/rpi4b.cfg b/bsp/meta-raspberrypi/recipes-kernel/linux/files/rpi4b.cfg similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/files/rpi4b.cfg rename to bsp/meta-raspberrypi/recipes-kernel/linux/files/rpi4b.cfg diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc rename to bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend rename to bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend rename to bsp/meta-raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend b/bsp/meta-raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend rename to bsp/meta-raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lops/lop-extract-uart5-for-zephyr.dts b/bsp/meta-raspberrypi/recipes-kernel/lopper/lops/lop-extract-uart5-for-zephyr.dts similarity index 100% rename from bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lops/lop-extract-uart5-for-zephyr.dts rename to bsp/meta-raspberrypi/recipes-kernel/lopper/lops/lop-extract-uart5-for-zephyr.dts diff --git a/bsp/meta-openeuler-bsp/wic/sdimage-rpi.wks b/bsp/meta-raspberrypi/wic/sdimage-rpi.wks similarity index 100% rename from bsp/meta-openeuler-bsp/wic/sdimage-rpi.wks rename to bsp/meta-raspberrypi/wic/sdimage-rpi.wks diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index fa3e484e08c..72cac613d5e 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -155,7 +155,7 @@ require ${OPENEULER_HOSTTOOLS_INC} HOSTTOOLS += "xz xzcat" ## bsp related configurations -require conf/distro/openeuler-bsp.conf +include conf/machine/openeuler-${MACHINE}.conf ## all bb files should inherit openeuler.bbclass diff --git a/meta-openeuler/conf/layer.conf b/meta-openeuler/conf/layer.conf index 4dda66d4228..220f878fe31 100644 --- a/meta-openeuler/conf/layer.conf +++ b/meta-openeuler/conf/layer.conf @@ -39,12 +39,6 @@ meta-arm:${LAYERDIR}/dynamic-layers/arm-layer/recipes-*/*/*.bb \ meta-arm:${LAYERDIR}/dynamic-layers/arm-layer/recipes-*/*/*.bbappend \ " -# enable .bb under rockchip-layer/ when exist rockchip -BBFILES_DYNAMIC += " \ -rockchip:${LAYERDIR}/dynamic-layers/rockchip-layer/recipes-*/*/*.bb \ -rockchip:${LAYERDIR}/dynamic-layers/rockchip-layer/recipes-*/*/*.bbappend \ -" - # enable .bb under clang-layer/ when exist meta-clang BBFILES_DYNAMIC += " \ clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes-*/*/*.bb \ -- Gitee