From b70c24375d09ac6fb9a84d32f66c45277dddb2fc Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Thu, 5 Dec 2024 21:45:17 -0500 Subject: u-boot boot script variable Many parts of the build assume the u-boot script will be supplied by u-boot-xlnx-scr. The script will be supplied, instead, by the variable UBOOT_BOOT_SCRIPT, whose default value is u-boot-xlnx-scr. Signed-off-by: Trevor Woerner Extend change from just versal to all systems. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 4 ++-- meta-xilinx-core/conf/machine/microblaze-generic.conf | 3 ++- meta-xilinx-core/conf/machine/versal-generic.conf | 3 ++- meta-xilinx-core/conf/machine/versal-net-generic.conf | 3 ++- meta-xilinx-core/conf/machine/zynq-generic.conf | 3 ++- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 3 ++- meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) 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 cf890a51..e6e8dd6d 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -55,7 +55,7 @@ IMAGE_BOOT_FILES_INSTALLED = "${@' '.join([x.split(';')[-1] for x in d.getVar('I WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.bin', ' virtual/boot-bin', '', d)}" 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', 'boot.scr', ' ${UBOOT_BOOT_SCRIPT}', '', 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', 'Image', ' virtual/kernel', '', d)}" WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage', ' virtual/kernel', '', d)}" @@ -65,7 +65,7 @@ WKS_FILE_DEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', '${INITR # Automatically add IMAGE_BOOT_FILES to /boot via packages MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'boot.bin', ' ${PREFERRED_PROVIDER_virtual/boot-bin}', '', d)}" 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', 'boot.scr', ' ${UBOOT_BOOT_SCRIPT}', '', 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', 'Image', ' kernel-image-image', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES_INSTALLED', 'uImage', ' kernel-image-uimage', '', d)}" diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index 39059511..9af5e83b 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -44,10 +44,11 @@ MACHINE_FEATURES = "" KERNEL_IMAGETYPE ?= "linux.bin.ub" KERNEL_IMAGETYPES = "" +UBOOT_BOOT_SCRIPT ?= "u-boot-xlnx-scr" EXTRA_IMAGEDEPENDS += " \ virtual/bootloader \ virtual/elfrealloc \ - u-boot-xlnx-scr \ + ${UBOOT_BOOT_SCRIPT} \ " IMAGE_FSTYPES += "cpio.gz" diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index 9aa47892..80ad17b9 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -35,8 +35,9 @@ 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.qemu-sd-fatimg'}" +UBOOT_BOOT_SCRIPT ?= "u-boot-xlnx-scr" EXTRA_IMAGEDEPENDS += " \ - u-boot-xlnx-scr \ + ${UBOOT_BOOT_SCRIPT} \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf index b26fb5e1..83ec54b6 100644 --- a/meta-xilinx-core/conf/machine/versal-net-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf @@ -35,8 +35,9 @@ 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.qemu-sd-fatimg'}" +UBOOT_BOOT_SCRIPT ?= "u-boot-xlnx-scr" EXTRA_IMAGEDEPENDS += " \ - u-boot-xlnx-scr \ + ${UBOOT_BOOT_SCRIPT} \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index 8442e4e3..661b3340 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf @@ -28,8 +28,9 @@ require conf/machine/include/machine-xilinx-qemu.inc MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget" +UBOOT_BOOT_SCRIPT ?= "u-boot-xlnx-scr" EXTRA_IMAGEDEPENDS += " \ - u-boot-xlnx-scr \ + ${UBOOT_BOOT_SCRIPT} \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 15a48102..ec17c297 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -43,10 +43,11 @@ 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'}" +UBOOT_BOOT_SCRIPT ?= "u-boot-xlnx-scr" EXTRA_IMAGEDEPENDS += " \ virtual/bootloader \ u-boot-xlnx-uenv \ - u-boot-xlnx-scr \ + ${UBOOT_BOOT_SCRIPT} \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb index b9236f55..80696176 100644 --- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb @@ -20,7 +20,7 @@ COMPATIBLE_MACHINE:versal-net = ".*" PROVIDES = "virtual/boot-bin" -DEPENDS += "bootgen-native u-boot-xlnx-scr" +DEPENDS += "bootgen-native ${UBOOT_BOOT_SCRIPT}" # There is no bitstream recipe, so really depend on virtual/bitstream # We need to refer to virtual/arm-trusted-firmware and not arm-trusted-firmware as there may be multiple providers @@ -50,7 +50,7 @@ BOOTGEN_EXTRA_ARGS ?= "" QEMU_FLASH_TYPE ?= "qspi" BOOTSCR_DEP = '' -BOOTSCR_DEP:versal = 'u-boot-xlnx-scr:do_deploy' +BOOTSCR_DEP:versal = '${UBOOT_BOOT_SCRIPT}:do_deploy' BOOTSCR_DEP:versal-net = 'u-boot-xlnx-scr:do_deploy' BIF_BITSTREAM_ATTR ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', '', 'bitstream', d)}" -- cgit v1.2.3-54-g00ecf