Rather than using ?= to default the value of IMAGE_BOOT_FILES, instead use += to add the files we want to the probably empty value.
We ran into an issue where the recent ti-core-initramfs changes used += and overrode the ?= in k3.inc, resulting in no boot files being packaged in the wic boot partition. This addresses the issue by ensuring that we never have a situation where the required files are not in the final list. Signed-off-by: Ryan Eatmon <[email protected]> --- meta-ti-bsp/conf/machine/include/am57xx.inc | 2 +- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- meta-ti-bsp/conf/machine/include/ti33x.inc | 2 +- meta-ti-bsp/conf/machine/include/ti43x.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc index 6acc0cb0..cce42e2c 100644 --- a/meta-ti-bsp/conf/machine/include/am57xx.inc +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc @@ -45,6 +45,6 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320 p IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4" +IMAGE_BOOT_FILES += "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4" do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 698b46d7..89a67f3c 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -43,7 +43,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-pka-fw" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin" +IMAGE_BOOT_FILES += "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 252b6e5a..2b5ee53b 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -91,5 +91,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" +IMAGE_BOOT_FILES += "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 5c09e2f5..0c37871a 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -63,5 +63,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" +IMAGE_BOOT_FILES += "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19536): https://lists.yoctoproject.org/g/meta-ti/message/19536 Mute This Topic: https://lists.yoctoproject.org/mt/117865867/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
