From 7d8e39084a7db11c267a2ecd10d2deceba02b20c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 16 May 2023 13:23:00 -0700 Subject: *-generic.conf: Fix hardcoded dependencies in the generic machines Each of these dependencies need to be based on preferred_provider. A hard dependency on u-boot-xlnx-uenv is not required to use qemu. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/microblaze-generic.conf | 2 +- meta-xilinx-core/conf/machine/versal-generic.conf | 2 +- meta-xilinx-core/conf/machine/zynq-generic.conf | 2 +- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index 2589da04..db1476ed 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -70,7 +70,7 @@ MACHINE_FEATURES = "" KERNEL_IMAGETYPE ?= "linux.bin.ub" KERNEL_IMAGETYPES = "" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" IMAGE_BOOT_FILES += " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index e44e99f2..3bf38b23 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -47,7 +47,7 @@ HDF_MACHINE = "vck190-versal" MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" # Default SD image build onfiguration, use qemu-sd to pad IMAGE_CLASSES += "image-types-xilinx-qemu" diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index df82a683..0409e4ba 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf @@ -46,7 +46,7 @@ HDF_MACHINE = "zc702-zynq7" MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" EXTRA_IMAGEDEPENDS += " \ libyaml-native \ diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index d24da3b4..5faa3095 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -65,7 +65,7 @@ IMAGE_CLASSES += "image-types-xilinx-qemu" # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" EXTRA_IMAGEDEPENDS += " \ libyaml-native \ @@ -150,8 +150,6 @@ QB_PMU_OPT = " \ QB_OPT_APPEND += " -pmu-args '${QB_PMU_OPT}'" -do_write_qemuboot_conf[depends] += "u-boot-xlnx-uenv:do_deploy" - #### No additional settings should be after the Postamble #### Postamble PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_generic']['zynqmp-generic' != "${MACHINE}"]}" -- cgit v1.2.3-54-g00ecf