| Message ID | 20250627193003.575911-2-afd@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,scarthgap/master,1/2] meta-ti-bsp: conf: machine: Deploy all versions of tiboot3.bin | expand |
On 6/27/2025 2:30 PM, Andrew Davis wrote: > U-Boot generates all the valid versions of tiboot3.bin and picks the > default based on the board's binman files. No need to duplicate this > logic here, simply deploy what U-Boot gives us. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- > meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- > meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- > meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- > meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- > meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- > meta-ti-bsp/conf/machine/include/k3.inc | 1 + > 15 files changed, 1 insertion(+), 101 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc > index e5f827a9..964be0ad 100644 > --- a/meta-ti-bsp/conf/machine/include/am62axx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc > @@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen" > > TFA_K3_SYSTEM_SUSPEND = "1" > > -# Default tiboot3.bin on AM62A is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" > - > TFA_BOARD = "lite" > OPTEEMACHINE = "k3-am62x" > > diff --git a/meta-ti-bsp/conf/machine/include/am62dxx.inc b/meta-ti-bsp/conf/machine/include/am62dxx.inc > index ac4e8e17..fc2ce4a3 100644 > --- a/meta-ti-bsp/conf/machine/include/am62dxx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc > @@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx" > > TFA_K3_SYSTEM_SUSPEND = "1" > > -# Default tiboot3.bin on AM62D is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin" > - > TFA_BOARD = "lite" > OPTEEMACHINE = "k3-am62x" > diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc > index 061d0e67..d59f607d 100644 > --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc > @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on AM62Px is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin" > - > TFA_BOARD = "lite" > TFA_K3_SYSTEM_SUSPEND = "1" > > diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc > index 1eb77b4e..74054a78 100644 > --- a/meta-ti-bsp/conf/machine/include/am62xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc > @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on AM62x is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP > -IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" > - > -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" > - > # Bitmap image tarball for early splashscreen > IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" > > diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc > index 56b56afe..e353e687 100644 > --- a/meta-ti-bsp/conf/machine/include/am64xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc > @@ -20,15 +20,6 @@ KERNEL_DEVICETREE = " \ > ti/k3-am642-tqma64xxl-mbax4xxl.dtb \ > " > > -# Default tiboot3.bin on AM64x is for SR2.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP > -IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" > - > -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" > - > TFA_BOARD = "lite" > > OPTEEMACHINE = "k3-am64x" > diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc > index 99a3b12f..feab624a 100644 > --- a/meta-ti-bsp/conf/machine/include/am65xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc > @@ -28,11 +28,9 @@ KERNEL_DEVICETREE = " \ > IMAGE_BOOT_FILES += "sysfw.itb" > > # Default on AM65x is for GP > -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" > IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" > > # Since default on AM65x is for GP, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" > IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" > > TFA_BOARD = "generic" > diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc > index 330a2973..b6d18fe0 100644 > --- a/meta-ti-bsp/conf/machine/include/am68.inc > +++ b/meta-ti-bsp/conf/machine/include/am68.inc > @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on AM68 is for SR1.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" > - > TFA_BOARD = "generic" > > OPTEEMACHINE = "k3-j784s4" > diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc > index 1a19410a..759984ea 100644 > --- a/meta-ti-bsp/conf/machine/include/am69.inc > +++ b/meta-ti-bsp/conf/machine/include/am69.inc > @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on AM69 is for SR1.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" > - > TFA_BOARD = "j784s4" > > OPTEEMACHINE = "k3-j784s4" > diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc > index e7ab409f..be5cb4cd 100644 > --- a/meta-ti-bsp/conf/machine/include/j7200.inc > +++ b/meta-ti-bsp/conf/machine/include/j7200.inc > @@ -3,21 +3,6 @@ require conf/machine/include/mc_k3r5.inc > > SOC_FAMILY:append = ":j7200" > > -# Default tiboot3.bin on J7200 is for GP > -IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" > - > -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" > - > -# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" > - > TFA_BOARD = "generic" > > OPTEEMACHINE = "k3-j721e" > diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc > index 3a5a9af6..5c7ef3b7 100644 > --- a/meta-ti-bsp/conf/machine/include/j721e.inc > +++ b/meta-ti-bsp/conf/machine/include/j721e.inc > @@ -11,24 +11,18 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > IMAGE_BOOT_FILES += "sysfw.itb" > > # Default on J721e is for GP > -IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-SE > -IMAGE_SR1_1_HS_SE_FILES = " " > -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" > > # Since default on J721e is for GP, add a version for SR2.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR2.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" > > TFA_BOARD = "generic" > diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc > index e6e4f162..b6d18fe0 100644 > --- a/meta-ti-bsp/conf/machine/include/j721s2.inc > +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc > @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on J721S2 is for GP > -IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" > - > -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" > - > TFA_BOARD = "generic" > > OPTEEMACHINE = "k3-j784s4" > diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc > index d49da340..8a02441b 100644 > --- a/meta-ti-bsp/conf/machine/include/j722s.inc > +++ b/meta-ti-bsp/conf/machine/include/j722s.inc > @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on J722S is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" > - > TFA_BOARD = "lite" > TFA_K3_SYSTEM_SUSPEND = "1" > > diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc > index 9a54e11e..d2de1d0d 100644 > --- a/meta-ti-bsp/conf/machine/include/j742s2.inc > +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc > @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on J742S2 is for HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin" > - > TFA_BOARD = "j784s4" > > OPTEEMACHINE = "k3-j784s4" > diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc > index 33224ee3..759984ea 100644 > --- a/meta-ti-bsp/conf/machine/include/j784s4.inc > +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc > @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" > require conf/machine/include/mesa-pvr.inc > PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > > -# Default tiboot3.bin on J784S4 is for GP > -IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" > - > -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS > -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" > - > -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE > -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" > - > TFA_BOARD = "j784s4" > > OPTEEMACHINE = "k3-j784s4" > diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc > index 9b85f867..d0f0bd62 100644 > --- a/meta-ti-bsp/conf/machine/include/k3.inc > +++ b/meta-ti-bsp/conf/machine/include/k3.inc > @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" > IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" > > IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" > +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" Does this match for all platforms? Even the -sk platform? > IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" > > EFI_PROVIDER ?= "grub-efi"
On 6/27/25 2:48 PM, Ryan Eatmon wrote: > > > On 6/27/2025 2:30 PM, Andrew Davis wrote: >> U-Boot generates all the valid versions of tiboot3.bin and picks the >> default based on the board's binman files. No need to duplicate this >> logic here, simply deploy what U-Boot gives us. >> >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- >> meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- >> meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- >> meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/k3.inc | 1 + >> 15 files changed, 1 insertion(+), 101 deletions(-) >> >> diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc >> index e5f827a9..964be0ad 100644 >> --- a/meta-ti-bsp/conf/machine/include/am62axx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc >> @@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen" >> TFA_K3_SYSTEM_SUSPEND = "1" >> -# Default tiboot3.bin on AM62A is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" >> - >> TFA_BOARD = "lite" >> OPTEEMACHINE = "k3-am62x" >> diff --git a/meta-ti-bsp/conf/machine/include/am62dxx.inc b/meta-ti-bsp/conf/machine/include/am62dxx.inc >> index ac4e8e17..fc2ce4a3 100644 >> --- a/meta-ti-bsp/conf/machine/include/am62dxx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc >> @@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx" >> TFA_K3_SYSTEM_SUSPEND = "1" >> -# Default tiboot3.bin on AM62D is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin" >> - >> TFA_BOARD = "lite" >> OPTEEMACHINE = "k3-am62x" >> diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc >> index 061d0e67..d59f607d 100644 >> --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc >> @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on AM62Px is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin" >> - >> TFA_BOARD = "lite" >> TFA_K3_SYSTEM_SUSPEND = "1" >> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc >> index 1eb77b4e..74054a78 100644 >> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc >> @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on AM62x is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP >> -IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" >> - >> -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" >> - >> # Bitmap image tarball for early splashscreen >> IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" >> diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc >> index 56b56afe..e353e687 100644 >> --- a/meta-ti-bsp/conf/machine/include/am64xx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc >> @@ -20,15 +20,6 @@ KERNEL_DEVICETREE = " \ >> ti/k3-am642-tqma64xxl-mbax4xxl.dtb \ >> " >> -# Default tiboot3.bin on AM64x is for SR2.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP >> -IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" >> - >> -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" >> - >> TFA_BOARD = "lite" >> OPTEEMACHINE = "k3-am64x" >> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc >> index 99a3b12f..feab624a 100644 >> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc >> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc >> @@ -28,11 +28,9 @@ KERNEL_DEVICETREE = " \ >> IMAGE_BOOT_FILES += "sysfw.itb" >> # Default on AM65x is for GP >> -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" >> # Since default on AM65x is for GP, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" >> TFA_BOARD = "generic" >> diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc >> index 330a2973..b6d18fe0 100644 >> --- a/meta-ti-bsp/conf/machine/include/am68.inc >> +++ b/meta-ti-bsp/conf/machine/include/am68.inc >> @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on AM68 is for SR1.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" >> - >> TFA_BOARD = "generic" >> OPTEEMACHINE = "k3-j784s4" >> diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc >> index 1a19410a..759984ea 100644 >> --- a/meta-ti-bsp/conf/machine/include/am69.inc >> +++ b/meta-ti-bsp/conf/machine/include/am69.inc >> @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on AM69 is for SR1.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" >> - >> TFA_BOARD = "j784s4" >> OPTEEMACHINE = "k3-j784s4" >> diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc >> index e7ab409f..be5cb4cd 100644 >> --- a/meta-ti-bsp/conf/machine/include/j7200.inc >> +++ b/meta-ti-bsp/conf/machine/include/j7200.inc >> @@ -3,21 +3,6 @@ require conf/machine/include/mc_k3r5.inc >> SOC_FAMILY:append = ":j7200" >> -# Default tiboot3.bin on J7200 is for GP >> -IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" >> - >> -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" >> - >> -# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" >> - >> TFA_BOARD = "generic" >> OPTEEMACHINE = "k3-j721e" >> diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc >> index 3a5a9af6..5c7ef3b7 100644 >> --- a/meta-ti-bsp/conf/machine/include/j721e.inc >> +++ b/meta-ti-bsp/conf/machine/include/j721e.inc >> @@ -11,24 +11,18 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> IMAGE_BOOT_FILES += "sysfw.itb" >> # Default on J721e is for GP >> -IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" >> # Since default on J721e is for GP, add a version for SR1.1 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" >> # Since default on J721e is for GP, add a version for SR1.1 HS-SE >> -IMAGE_SR1_1_HS_SE_FILES = " " >> -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" >> # Since default on J721e is for GP, add a version for SR2.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" >> # Since default on J721e is for GP, add a version for SR2.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" >> TFA_BOARD = "generic" >> diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc >> index e6e4f162..b6d18fe0 100644 >> --- a/meta-ti-bsp/conf/machine/include/j721s2.inc >> +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc >> @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on J721S2 is for GP >> -IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" >> - >> -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" >> - >> TFA_BOARD = "generic" >> OPTEEMACHINE = "k3-j784s4" >> diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc >> index d49da340..8a02441b 100644 >> --- a/meta-ti-bsp/conf/machine/include/j722s.inc >> +++ b/meta-ti-bsp/conf/machine/include/j722s.inc >> @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on J722S is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" >> - >> TFA_BOARD = "lite" >> TFA_K3_SYSTEM_SUSPEND = "1" >> diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc >> index 9a54e11e..d2de1d0d 100644 >> --- a/meta-ti-bsp/conf/machine/include/j742s2.inc >> +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc >> @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on J742S2 is for HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin" >> - >> TFA_BOARD = "j784s4" >> OPTEEMACHINE = "k3-j784s4" >> diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc >> index 33224ee3..759984ea 100644 >> --- a/meta-ti-bsp/conf/machine/include/j784s4.inc >> +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc >> @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" >> require conf/machine/include/mesa-pvr.inc >> PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> -# Default tiboot3.bin on J784S4 is for GP >> -IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" >> - >> -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS >> -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" >> - >> -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE >> -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" >> - >> TFA_BOARD = "j784s4" >> OPTEEMACHINE = "k3-j784s4" >> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc >> index 9b85f867..d0f0bd62 100644 >> --- a/meta-ti-bsp/conf/machine/include/k3.inc >> +++ b/meta-ti-bsp/conf/machine/include/k3.inc >> @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" >> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" >> IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" >> +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" > > Does this match for all platforms? Even the -sk platform? > Yes, the -evm part of tiboot3 is not directly related to the board but instead the SYSFW board files used, which are always -evm. I was going to go with "tiboot3*.bin" and get even tiboot3.bin all in one go, but that pulls in the yocto generated symlinks (like tiboot3-j722s-hs-fs-evm-beagley-ai-k3r5-2025.04) so the above is the safest option that correctly pulls in all versions and nothing extra. Andrew > >> IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" >> EFI_PROVIDER ?= "grub-efi" >
Hi Andrew, On 28/06/25 01:00, Andrew Davis via lists.yoctoproject.org wrote: > U-Boot generates all the valid versions of tiboot3.bin and picks the > default based on the board's binman files. No need to duplicate this > logic here, simply deploy what U-Boot gives us. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- > meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- > meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- > meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ > meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- > meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- > meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ > meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- > meta-ti-bsp/conf/machine/include/k3.inc | 1 + > 15 files changed, 1 insertion(+), 101 deletions(-) > <snip> > diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc > index 9b85f867..d0f0bd62 100644 > --- a/meta-ti-bsp/conf/machine/include/k3.inc > +++ b/meta-ti-bsp/conf/machine/include/k3.inc > @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" > IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" > > IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" > +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" This commit seems to undo the effect of [0] which resolved SITSW-7159 There was a request to not package tiboot3-am62ax-gp-evm.bin inside vfat boot partition of wic image but k3-am62a-sk-binman.dtsi [1] would still have it for Astc/vlab folks who know how to use the u-boot sources. Hence, even if this approach to ship all tiboot3.bin generated by u-boot build seems logically correct but it ends up deploying tiboot3 for GP samples which were only used internally for initial device bring-up & not available publicly. [0] https://git.yoctoproject.org/meta-ti/commit/?h=scarthgap-next&id=492a9aa4a92787185b41023e1026369d4028c1eb [1] https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/arch/arm/dts/k3-am62a-sk-binman.dtsi?h=11.01.04#n104 Chirag > IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" > > EFI_PROVIDER ?= "grub-efi" > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#18710): https://lists.yoctoproject.org/g/meta-ti/message/18710 > Mute This Topic: https://lists.yoctoproject.org/mt/113867726/7030289 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [c-shilwant@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 7/1/25 7:06 AM, Chirag Shilwant wrote: > Hi Andrew, > On 28/06/25 01:00, Andrew Davis via lists.yoctoproject.org wrote: >> U-Boot generates all the valid versions of tiboot3.bin and picks the >> default based on the board's binman files. No need to duplicate this >> logic here, simply deploy what U-Boot gives us. >> >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- >> meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- >> meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- >> meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ >> meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- >> meta-ti-bsp/conf/machine/include/k3.inc | 1 + >> 15 files changed, 1 insertion(+), 101 deletions(-) >> > > <snip> > >> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc >> index 9b85f867..d0f0bd62 100644 >> --- a/meta-ti-bsp/conf/machine/include/k3.inc >> +++ b/meta-ti-bsp/conf/machine/include/k3.inc >> @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" >> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" >> IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" >> +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" > > > This commit seems to undo the effect of [0] which resolved SITSW-7159 > There was a request to not package tiboot3-am62ax-gp-evm.bin inside vfat boot partition of wic image > but k3-am62a-sk-binman.dtsi [1] would still have it for Astc/vlab folks who know how to use the u-boot sources. > > > Hence, even if this approach to ship all tiboot3.bin generated by u-boot build seems logically correct > but it ends up deploying tiboot3 for GP samples which were only used internally for initial device bring-up > & not available publicly. > Then that version of tiboot3.bin should not be generated by U-Boot, keeping the logic of which tiboot3.bin variants are valid or not shouldn't be put in each distro, let's drop that version from U-Boot binman if it has no reason to be. Andrew > > [0] https://git.yoctoproject.org/meta-ti/commit/?h=scarthgap-next&id=492a9aa4a92787185b41023e1026369d4028c1eb > > [1] https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/arch/arm/dts/k3-am62a-sk-binman.dtsi?h=11.01.04#n104 > > > Chirag > > >> IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" >> EFI_PROVIDER ?= "grub-efi" >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#18710): https://lists.yoctoproject.org/g/meta-ti/message/18710 >> Mute This Topic: https://lists.yoctoproject.org/mt/113867726/7030289 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [c-shilwant@ti.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On 7/1/2025 8:25 AM, Andrew Davis wrote: > On 7/1/25 7:06 AM, Chirag Shilwant wrote: >> Hi Andrew, >> On 28/06/25 01:00, Andrew Davis via lists.yoctoproject.org wrote: >>> U-Boot generates all the valid versions of tiboot3.bin and picks the >>> default based on the board's binman files. No need to duplicate this >>> logic here, simply deploy what U-Boot gives us. >>> >>> Signed-off-by: Andrew Davis <afd@ti.com> >>> --- >>> meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- >>> meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- >>> meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- >>> meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- >>> meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- >>> meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ >>> meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- >>> meta-ti-bsp/conf/machine/include/k3.inc | 1 + >>> 15 files changed, 1 insertion(+), 101 deletions(-) >>> >> >> <snip> >> >>> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc >>> b/meta-ti-bsp/conf/machine/include/k3.inc >>> index 9b85f867..d0f0bd62 100644 >>> --- a/meta-ti-bsp/conf/machine/include/k3.inc >>> +++ b/meta-ti-bsp/conf/machine/include/k3.inc >>> @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 >>> alsa pci optee-ftpm" >>> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" >>> IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} >>> tiboot3.bin" >>> +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" >> >> >> This commit seems to undo the effect of [0] which resolved SITSW-7159 >> There was a request to not package tiboot3-am62ax-gp-evm.bin inside >> vfat boot partition of wic image >> but k3-am62a-sk-binman.dtsi [1] would still have it for Astc/vlab >> folks who know how to use the u-boot sources. >> >> >> Hence, even if this approach to ship all tiboot3.bin generated by >> u-boot build seems logically correct >> but it ends up deploying tiboot3 for GP samples which were only used >> internally for initial device bring-up >> & not available publicly. >> > > Then that version of tiboot3.bin should not be generated by U-Boot, > keeping the logic of > which tiboot3.bin variants are valid or not shouldn't be put in each > distro, let's drop > that version from U-Boot binman if it has no reason to be. Agreed. > Andrew > >> >> [0] >> https://git.yoctoproject.org/meta-ti/commit/?h=scarthgap-next&id=492a9aa4a92787185b41023e1026369d4028c1eb >> >> [1] >> https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/arch/arm/dts/k3-am62a-sk-binman.dtsi?h=11.01.04#n104 >> >> >> Chirag >> >> >>> IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" >>> EFI_PROVIDER ?= "grub-efi" >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#18710): >>> https://lists.yoctoproject.org/g/meta-ti/message/18710 >>> Mute This Topic: https://lists.yoctoproject.org/mt/113867726/7030289 >>> Group Owner: meta-ti+owner@lists.yoctoproject.org >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub >>> [c-shilwant@ti.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index e5f827a9..964be0ad 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62A is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62dxx.inc b/meta-ti-bsp/conf/machine/include/am62dxx.inc index ac4e8e17..fc2ce4a3 100644 --- a/meta-ti-bsp/conf/machine/include/am62dxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc @@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62D is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index 061d0e67..d59f607d 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM62Px is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin" - TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 1eb77b4e..74054a78 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM62x is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP -IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" - -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" - # Bitmap image tarball for early splashscreen IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 56b56afe..e353e687 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -20,15 +20,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-tqma64xxl-mbax4xxl.dtb \ " -# Default tiboot3.bin on AM64x is for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 99a3b12f..feab624a 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -28,11 +28,9 @@ KERNEL_DEVICETREE = " \ IMAGE_BOOT_FILES += "sysfw.itb" # Default on AM65x is for GP -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" # Since default on AM65x is for GP, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index 330a2973..b6d18fe0 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM68 is for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 1a19410a..759984ea 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM69 is for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index e7ab409f..be5cb4cd 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -3,21 +3,6 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j7200" -# Default tiboot3.bin on J7200 is for GP -IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 3a5a9af6..5c7ef3b7 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -11,24 +11,18 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "sysfw.itb" # Default on J721e is for GP -IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_SR1_1_HS_SE_FILES = " " -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index e6e4f162..b6d18fe0 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J721S2 is for GP -IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" - -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index d49da340..8a02441b 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J722S is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" - -# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" - TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index 9a54e11e..d2de1d0d 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J742S2 is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 33224ee3..759984ea 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J784S4 is for GP -IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" - -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" - -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 9b85f867..d0f0bd62 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi"
U-Boot generates all the valid versions of tiboot3.bin and picks the default based on the board's binman files. No need to duplicate this logic here, simply deploy what U-Boot gives us. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- meta-ti-bsp/conf/machine/include/k3.inc | 1 + 15 files changed, 1 insertion(+), 101 deletions(-)