mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-07 11:20:45 +00:00
Code Issues Projects Releases Wiki Activity

conf: Change weak assignment of IMAGE_BOOT_FILES

Browse Source 
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 <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2026-02-17 10:07:12 -06:00
parent 1c2398c320
commit 123245b638
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/include/am57xx.inc
+1 -1
View File
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc
+1 -1
View File
@@ -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"
meta-ti-bsp/conf/machine/include/ti33x.inc
+1 -1
View File
@@ -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"
meta-ti-bsp/conf/machine/include/ti43x.inc
+1 -1
View File
@@ -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"