| Message ID | 20220609145909.15483-1-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell,v3] conf: machine: wic: Fix HS image boot partition | expand |
On 09:59-20220609, 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> > --- > > Changes from v2: > - Added UBOOT_SYMLINK to fix missing u-boot.img image LGTM. Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> > > 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 >
On 6/14/2022 3:20, Manorit Chawdhry wrote: > On 09:59-20220609, 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> >> --- >> >> Changes from v2: >> - Added UBOOT_SYMLINK to fix missing u-boot.img image > > LGTM. > > Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up? >> >> 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 >>
On 6/15/22 9:52 AM, Ryan Eatmon wrote: > > > On 6/14/2022 3:20, Manorit Chawdhry wrote: >> On 09:59-20220609, 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> >>> --- >>> >>> Changes from v2: >>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >> >> LGTM. >> >> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> > > > I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up? > > We can make a delta patch to fixup j721s2 after this goes in. Jayesh, Can you take that action, see what we did here for each platform and do the same for j721s2-hs and submit a patch. Andrew > >>> >>> 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 >>> >
On 15/06/22 20:41, Andrew Davis wrote: > On 6/15/22 9:52 AM, Ryan Eatmon wrote: >> >> >> On 6/14/2022 3:20, Manorit Chawdhry wrote: >>> On 09:59-20220609, 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> >>>> --- >>>> >>>> Changes from v2: >>>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >>> >>> LGTM. >>> >>> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> >> >> >> I hate to ask this, but I just merged in the patches to add >> j721s2-hs-evm support... do you want to make a V4 and make the same >> changes in that file? or do you want to submit another patch to clean >> that up? >> >> > > > We can make a delta patch to fixup j721s2 after this goes in. > > Jayesh, > > Can you take that action, see what we did here for each platform and > do the same for j721s2-hs and submit a patch. > > Andrew > > Okay sure!! I will post the delta patch. -Jayesh
On 6/15/2022 10:57, Jayesh Choudhary wrote: > > > On 15/06/22 20:41, Andrew Davis wrote: >> On 6/15/22 9:52 AM, Ryan Eatmon wrote: >>> >>> >>> On 6/14/2022 3:20, Manorit Chawdhry wrote: >>>> On 09:59-20220609, 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> >>>>> --- >>>>> >>>>> Changes from v2: >>>>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >>>> >>>> LGTM. >>>> >>>> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> >>> >>> >>> I hate to ask this, but I just merged in the patches to add >>> j721s2-hs-evm support... do you want to make a V4 and make the same >>> changes in that file? or do you want to submit another patch to clean >>> that up? >>> >>> >> >> >> We can make a delta patch to fixup j721s2 after this goes in. >> Andrew, There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched.
On 6/15/22 1:55 PM, Ryan Eatmon wrote: > > > On 6/15/2022 10:57, Jayesh Choudhary wrote: >> >> >> On 15/06/22 20:41, Andrew Davis wrote: >>> On 6/15/22 9:52 AM, Ryan Eatmon wrote: >>>> >>>> >>>> On 6/14/2022 3:20, Manorit Chawdhry wrote: >>>>> On 09:59-20220609, 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> >>>>>> --- >>>>>> >>>>>> Changes from v2: >>>>>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >>>>> >>>>> LGTM. >>>>> >>>>> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> >>>> >>>> >>>> I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up? >>>> >>>> >>> >>> >>> We can make a delta patch to fixup j721s2 after this goes in. >>> > > > Andrew, > > There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched. > > 'conf: machine: Make multi-certificate image the default'? I just dropped it for now, it is un-related to the first patch. It is still valid and if you would like you can take the v1 of that patch, it would save me from having to send it again as a standalone.. Andrew
On 6/15/2022 13:58, Andrew Davis wrote: > On 6/15/22 1:55 PM, Ryan Eatmon wrote: >> >> >> On 6/15/2022 10:57, Jayesh Choudhary wrote: >>> >>> >>> On 15/06/22 20:41, Andrew Davis wrote: >>>> On 6/15/22 9:52 AM, Ryan Eatmon wrote: >>>>> >>>>> >>>>> On 6/14/2022 3:20, Manorit Chawdhry wrote: >>>>>> On 09:59-20220609, 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> >>>>>>> --- >>>>>>> >>>>>>> Changes from v2: >>>>>>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >>>>>> >>>>>> LGTM. >>>>>> >>>>>> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> >>>>> >>>>> >>>>> I hate to ask this, but I just merged in the patches to add >>>>> j721s2-hs-evm support... do you want to make a V4 and make the same >>>>> changes in that file? or do you want to submit another patch to >>>>> clean that up? >>>>> >>>>> >>>> >>>> >>>> We can make a delta patch to fixup j721s2 after this goes in. >>>> >> >> >> Andrew, >> >> There was a second patch in V1, but it is missing in V2 and V3. Did >> you mean to drop it? Or is that coming later? I just want to make >> sure I don't miss something you meant to have patched. >> >> > > 'conf: machine: Make multi-certificate image the default'? > > I just dropped it for now, it is un-related to the first patch. > It is still valid and if you would like you can take the v1 > of that patch, it would save me from having to send it > again as a standalone.. > > Andrew Thank you.
On 6/9/2022 9:59, 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> > --- > > Changes from v2: > - Added UBOOT_SYMLINK to fix missing u-boot.img image > > 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(-) I am getting build errors for several of the HS platforms related to this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb recipe is failing because the u-boot-<MACHINE>.img file is not in the deploy/images directory. When I drop the patch all of the builds work correctly. > 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}"
On Mon, Jun 20, 2022 at 02:11:55PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 6/9/2022 9:59, 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> > >--- > > > >Changes from v2: > > - Added UBOOT_SYMLINK to fix missing u-boot.img image > > > > 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(-) > > > I am getting build errors for several of the HS platforms related to > this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb > recipe is failing because the u-boot-<MACHINE>.img file is not in > the deploy/images directory. > > When I drop the patch all of the builds work correctly. Which platforms are failing?
On 6/20/2022 14:22, Denys Dmytriyenko wrote: > On Mon, Jun 20, 2022 at 02:11:55PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> >> >> On 6/9/2022 9:59, 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> >>> --- >>> >>> Changes from v2: >>> - Added UBOOT_SYMLINK to fix missing u-boot.img image >>> >>> 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(-) >> >> >> I am getting build errors for several of the HS platforms related to >> this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb >> recipe is failing because the u-boot-<MACHINE>.img file is not in >> the deploy/images directory. >> >> When I drop the patch all of the builds work correctly. > > Which platforms are failing? The ones referenced in the patch. am64xx-hs-evm, am65xx-hs-evm, j7-hs-evm and j7200-hs-evm.
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}"