From 5cb1db71994eb51a4d11cacd4ca8c3ae9103bee8 Mon Sep 17 00:00:00 2001 From: John Toomey Date: Wed, 19 Jun 2024 14:28:06 +0100 Subject: Remove firmware deps from generic machine configs The generic machine configurations should not have a direct dependency on specific firmware components as these dependencies should be associated with boot.bin (or similar). This change also removes WIC_DEPENDS as it is no longer required Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 8 -------- meta-xilinx-core/conf/machine/include/soc-versal-net.inc | 2 -- meta-xilinx-core/conf/machine/include/soc-versal.inc | 2 -- meta-xilinx-core/conf/machine/include/soc-zynq.inc | 3 --- meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 2 -- meta-xilinx-core/conf/machine/versal-generic.conf | 4 ---- meta-xilinx-core/conf/machine/versal-net-generic.conf | 4 ---- meta-xilinx-core/conf/machine/zynq-generic.conf | 3 --- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 3 --- 9 files changed, 31 deletions(-) (limited to 'meta-xilinx-core/conf') diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index 904b4861..9284aa1f 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -27,8 +27,6 @@ PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx" PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx" PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx" -do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" - UBOOT_SUFFIX ?= "bin" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" @@ -61,12 +59,9 @@ WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.bi WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'system.dtb', ' virtual/dtb', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.scr', ' u-boot-xlnx-scr', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uEnv.txt', ' u-boot-xlnx-uenv', '', d)}" -WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'atf-uboot.ub', ' arm-trusted-firmware', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'Image', ' virtual/kernel', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage', ' virtual/kernel', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'zImage', ' virtual/kernel', '', d)}" -WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.bin', ' virtual/bootloader', '', d)}" -WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.elf', ' virtual/bootloader', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', '${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot', ' ${INITRAMFS_IMAGE}', '', d)}" # Automatically add IMAGE_BOOT_FILES to /boot via packages @@ -74,9 +69,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INST MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'system.dtb', ' ${PREFERRED_PROVIDER_virtual/dtb}', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.scr', ' u-boot-xlnx-scr', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uEnv.txt', ' u-boot-xlnx-uenv', '', d)}" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'atf-uboot.ub', ' arm-trusted-firmware', '', d)}" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.bin', ' ${PREFERRED_PROVIDER_virtual/bootloader}-bin', '', d)}" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'u-boot.elf', ' ${PREFERRED_PROVIDER_virtual/bootloader}-elf', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'Image', ' kernel-image-image', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage', ' kernel-image-uimage', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'zImage', ' kernel-image-zimage', '', d)}" diff --git a/meta-xilinx-core/conf/machine/include/soc-versal-net.inc b/meta-xilinx-core/conf/machine/include/soc-versal-net.inc index b59bdacc..f7898e0d 100644 --- a/meta-xilinx-core/conf/machine/include/soc-versal-net.inc +++ b/meta-xilinx-core/conf/machine/include/soc-versal-net.inc @@ -7,8 +7,6 @@ require soc-tune-include.inc # Linux Configuration KERNEL_IMAGETYPE ?= "Image" -WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware" - UBOOT_ELF ?= "u-boot.elf" # Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version diff --git a/meta-xilinx-core/conf/machine/include/soc-versal.inc b/meta-xilinx-core/conf/machine/include/soc-versal.inc index daa129af..1fcb412a 100644 --- a/meta-xilinx-core/conf/machine/include/soc-versal.inc +++ b/meta-xilinx-core/conf/machine/include/soc-versal.inc @@ -15,8 +15,6 @@ require soc-tune-include.inc # Linux Configuration KERNEL_IMAGETYPE ?= "Image" -WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware" - UBOOT_ELF ?= "u-boot.elf" # Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version diff --git a/meta-xilinx-core/conf/machine/include/soc-zynq.inc b/meta-xilinx-core/conf/machine/include/soc-zynq.inc index e456a31f..02220e8a 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynq.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc @@ -8,9 +8,6 @@ require soc-tune-include.inc KERNEL_IMAGETYPE ?= "uImage" KERNEL_IMAGETYPES += "zImage" -# WIC Specific dependencies -WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin" - UBOOT_ELF ?= "u-boot.elf" # Default, if multiconfig is off, the fsbl is in the regular deploydir, otherwise diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc index a9c3ad73..aee5c19c 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc @@ -16,8 +16,6 @@ KERNEL_IMAGETYPE ?= "Image" # Support multilib on zynqmp DEFAULTTUNE:virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4" -WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware" - UBOOT_SUFFIX ?= "bin" XSERVER_EXT:zynqmp ?= "xf86-video-armsoc" diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index 1356f91c..2be4ea96 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -57,11 +57,7 @@ EXTRA_IMAGEDEPENDS += " \ libyaml-native \ python3-cython-native \ python3-pyyaml-native \ - arm-trusted-firmware \ virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ u-boot-xlnx-scr \ qemu-devicetrees:do_deploy \ virtual/cdo:do_deploy \ diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf index 65c2dd23..22fce526 100644 --- a/meta-xilinx-core/conf/machine/versal-net-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf @@ -57,11 +57,7 @@ EXTRA_IMAGEDEPENDS += " \ libyaml-native \ python3-cython-native \ python3-pyyaml-native \ - arm-trusted-firmware \ virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ u-boot-xlnx-scr \ qemu-devicetrees:do_deploy \ virtual/cdo:do_deploy \ diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index 3dea2012..27b10833 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf @@ -51,9 +51,6 @@ EXTRA_IMAGEDEPENDS += " \ libyaml-native \ python3-cython-native \ python3-pyyaml-native \ - virtual/fsbl \ - virtual/boot-bin \ - virtual/bootloader \ u-boot-xlnx-scr \ " diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index b5a2f832..c69fcd1d 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -70,9 +70,6 @@ EXTRA_IMAGEDEPENDS += " \ libyaml-native \ python3-cython-native \ python3-pyyaml-native \ - virtual/fsbl \ - virtual/pmu-firmware \ - arm-trusted-firmware \ virtual/boot-bin \ virtual/bootloader \ qemu-devicetrees:do_deploy \ -- cgit v1.2.3-54-g00ecf