On 09:59-20220609, Andrew Davis wrote: > From: Manorit Chawdhry <[email protected]> > > IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to > incomplete binaries in /boot and the naming of the binaries were not > correct. > > Fixes /boot partition for HS devices. > > Signed-off-by: Manorit Chawdhry <[email protected]> > [afd: Extended fix to all HS platforms] > Signed-off-by: Andrew Davis <[email protected]> > --- > > Changes from v2: > - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM. Acked-by: Manorit Chawdhry <[email protected]> > > conf/machine/am64xx-hs-evm.conf | 3 +-- > conf/machine/am65xx-hs-evm.conf | 3 +-- > conf/machine/include/k3.inc | 5 +++-- > conf/machine/j7-hs-evm.conf | 3 +-- > conf/machine/j7200-hs-evm.conf | 3 +-- > 5 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf > index 44e81463..ebbe2e62 100644 > --- a/conf/machine/am64xx-hs-evm.conf > +++ b/conf/machine/am64xx-hs-evm.conf > @@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" > UBOOT_DTBO_OFFSET = "0x00010000" > > SPL_BINARY = "tispl.bin_HS" > -SPL_BINARYNAME = "tispl.bin" > UBOOT_BINARY = "u-boot.img_HS" > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" > +UBOOT_SYMLINK = "u-boot.img" > > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" > diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf > index e4eebb6a..de92cacb 100644 > --- a/conf/machine/am65xx-hs-evm.conf > +++ b/conf/machine/am65xx-hs-evm.conf > @@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" > UBOOT_DTBO_OFFSET = "0x00010000" > > SPL_BINARY = "tispl.bin_HS" > -SPL_BINARYNAME = "tispl.bin" > UBOOT_BINARY = "u-boot.img_HS" > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" > +UBOOT_SYMLINK = "u-boot.img" > > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" > diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc > index e0970698..f85e6b98 100644 > --- a/conf/machine/include/k3.inc > +++ b/conf/machine/include/k3.inc > @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000" > UBOOT_LOADADDRESS = "0x80008000" > > SPL_BINARY = "tispl.bin" > +SPL_BINARYNAME = "tispl.bin" > UBOOT_SUFFIX = "img" > > EXTRA_IMAGEDEPENDS += "virtual/bootloader" > @@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat > ext2 alsa ethernet pci" > > IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" > > -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin > sysfw.itb" > -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} > tiboot3.bin" > +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} > tiboot3.bin sysfw.itb" > +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} > tiboot3.bin" > > IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" > > diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf > index f2e3ccf5..ece0d85e 100644 > --- a/conf/machine/j7-hs-evm.conf > +++ b/conf/machine/j7-hs-evm.conf > @@ -15,9 +15,8 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" > UBOOT_DTBO_OFFSET = "0x00010000" > > SPL_BINARY = "tispl.bin_HS" > -SPL_BINARYNAME = "tispl.bin" > UBOOT_BINARY = "u-boot.img_HS" > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" > +UBOOT_SYMLINK = "u-boot.img" > > BBMULTICONFIG += "k3r5-sr1-1" > > diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf > index a5bd637e..8821ffac 100644 > --- a/conf/machine/j7200-hs-evm.conf > +++ b/conf/machine/j7200-hs-evm.conf > @@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" > UBOOT_DTBO_OFFSET = "0x00010000" > > SPL_BINARY = "tispl.bin_HS" > -SPL_BINARYNAME = "tispl.bin" > UBOOT_BINARY = "u-boot.img_HS" > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" > +UBOOT_SYMLINK = "u-boot.img" > > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" > -- > 2.36.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14813): https://lists.yoctoproject.org/g/meta-ti/message/14813 Mute This Topic: https://lists.yoctoproject.org/mt/91647307/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
