| Message ID | 20220608200254.28768-1-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell,v2] conf: machine: wic: Fix HS image boot partition | expand |
On 15:02-20220608, Andrew Davis wrote: > From: Manorit Chawdhry <m-chawdhry@ti.com> > > 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 <m-chawdhry@ti.com> > [afd: Extended fix to all HS platforms] > Signed-off-by: Andrew Davis <afd@ti.com> Hi, the builds are failing for this. Maybe try some clean builds? Regards, Manorit > --- > > Changes from v1: > - Use signed u-boot.img file for HS > > conf/machine/am64xx-hs-evm.conf | 2 -- > conf/machine/am65xx-hs-evm.conf | 2 -- > conf/machine/include/k3.inc | 5 +++-- > conf/machine/j7-hs-evm.conf | 2 -- > conf/machine/j7200-hs-evm.conf | 2 -- > 5 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf > index 44e81463..c63d382e 100644 > --- a/conf/machine/am64xx-hs-evm.conf > +++ b/conf/machine/am64xx-hs-evm.conf > @@ -15,8 +15,6 @@ 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}" > > 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..a28b45dc 100644 > --- a/conf/machine/am65xx-hs-evm.conf > +++ b/conf/machine/am65xx-hs-evm.conf > @@ -15,8 +15,6 @@ 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}" > > 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..c7766def 100644 > --- a/conf/machine/j7-hs-evm.conf > +++ b/conf/machine/j7-hs-evm.conf > @@ -15,9 +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}" > > BBMULTICONFIG += "k3r5-sr1-1" > > diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf > index a5bd637e..93c0c0ce 100644 > --- a/conf/machine/j7200-hs-evm.conf > +++ b/conf/machine/j7200-hs-evm.conf > @@ -15,8 +15,6 @@ 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}" > > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" > -- > 2.36.1 >
On 6/9/22 8:45 AM, Manorit Chawdhry wrote: > On 15:02-20220608, Andrew Davis wrote: >> From: Manorit Chawdhry <m-chawdhry@ti.com> >> >> 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 <m-chawdhry@ti.com> >> [afd: Extended fix to all HS platforms] >> Signed-off-by: Andrew Davis <afd@ti.com> > > Hi, the builds are failing for this. Maybe try some clean builds? > Had to completely remove all build and caches to get it to fail here, odd would have expected only removing the build dir to show this issue. This turned out a bit more involved than I was expecting, but think I found a way to pull in the _HS version and do the rename without effecting anything else.. sending v3. Thanks, Andrew > Regards, > Manorit > >> --- >> >> Changes from v1: >> - Use signed u-boot.img file for HS >> >> conf/machine/am64xx-hs-evm.conf | 2 -- >> conf/machine/am65xx-hs-evm.conf | 2 -- >> conf/machine/include/k3.inc | 5 +++-- >> conf/machine/j7-hs-evm.conf | 2 -- >> conf/machine/j7200-hs-evm.conf | 2 -- >> 5 files changed, 3 insertions(+), 10 deletions(-) >> >> diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf >> index 44e81463..c63d382e 100644 >> --- a/conf/machine/am64xx-hs-evm.conf >> +++ b/conf/machine/am64xx-hs-evm.conf >> @@ -15,8 +15,6 @@ 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}" >> >> 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..a28b45dc 100644 >> --- a/conf/machine/am65xx-hs-evm.conf >> +++ b/conf/machine/am65xx-hs-evm.conf >> @@ -15,8 +15,6 @@ 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}" >> >> 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..c7766def 100644 >> --- a/conf/machine/j7-hs-evm.conf >> +++ b/conf/machine/j7-hs-evm.conf >> @@ -15,9 +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}" >> >> BBMULTICONFIG += "k3r5-sr1-1" >> >> diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf >> index a5bd637e..93c0c0ce 100644 >> --- a/conf/machine/j7200-hs-evm.conf >> +++ b/conf/machine/j7200-hs-evm.conf >> @@ -15,8 +15,6 @@ 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}" >> >> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" >> -- >> 2.36.1 >>
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf index 44e81463..c63d382e 100644 --- a/conf/machine/am64xx-hs-evm.conf +++ b/conf/machine/am64xx-hs-evm.conf @@ -15,8 +15,6 @@ 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}" 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..a28b45dc 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -15,8 +15,6 @@ 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}" 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..c7766def 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -15,9 +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}" BBMULTICONFIG += "k3r5-sr1-1" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index a5bd637e..93c0c0ce 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -15,8 +15,6 @@ 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}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"