Skip to contentSkip to conversation

meta-ti-bsp: conf: machine: Deploy all versions of tiboot3.bin

PATCH In review Andrew Davis 3 participants 10 messages Jun 27, 2025 – Jul 1, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 meta-ti-bsp: conf: machine: Deploy all versions of tiboot3.bin

For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here.

---
 meta-ti-bsp/conf/machine/include/j7200.inc |  8 ++------
 meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++----------
 meta-ti-bsp/conf/machine/include/j722s.inc |  5 +----
 3 files changed, 12 insertions(+), 20 deletions(-)
meta-ti-bsp/conf/machine/include/j7200.inc +2 -6
index 3cba71b6..e7ab409f 100644
@@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200"
 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_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
-IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+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_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+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"
meta-ti-bsp/conf/machine/include/j721e.inc +9 -10
index 30aa2a69..3a5a9af6 100644
@@ -15,22 +15,21 @@ 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_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
-IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+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 = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+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_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+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_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
-IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
 
 TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j722s.inc +1 -4
index e0b77d96..d49da340 100644
@@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 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_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/2 meta-ti-bsp: Add all tiboot3.bin variants by wildcard

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.

---
 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(-)
meta-ti-bsp/conf/machine/include/am62axx.inc +0 -6
index e5f827a9..964be0ad 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am62dxx.inc +0 -6
index ac4e8e17..fc2ce4a3 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am62pxx.inc +0 -6
index 061d0e67..d59f607d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -9
index 1eb77b4e..74054a78 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -9
index 56b56afe..e353e687 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -2
index 99a3b12f..feab624a 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am68.inc +0 -6
index 330a2973..b6d18fe0 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am69.inc +0 -6
index 1a19410a..759984ea 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j7200.inc +0 -15
index e7ab409f..be5cb4cd 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -6
index 3a5a9af6..5c7ef3b7 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j721s2.inc +0 -9
index e6e4f162..b6d18fe0 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j722s.inc +0 -6
index d49da340..8a02441b 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/j742s2.inc +0 -6
index 9a54e11e..d2de1d0d 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -9
index 33224ee3..759984ea 100644
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc +1 -0
index 9b85f867..d0f0bd62 100644
@@ -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"
Signature · 1 line
2.39.2
#2 lore raw

Re: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard

Quoted 297 lines · Andrew Davis

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.

---
  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(-)
meta-ti-bsp/conf/machine/include/am62axx.inc +0 -6
index e5f827a9..964be0ad 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am62dxx.inc +0 -6
index ac4e8e17..fc2ce4a3 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am62pxx.inc +0 -6
index 061d0e67..d59f607d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -9
index 1eb77b4e..74054a78 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -9
index 56b56afe..e353e687 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -2
index 99a3b12f..feab624a 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am68.inc +0 -6
index 330a2973..b6d18fe0 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am69.inc +0 -6
index 1a19410a..759984ea 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j7200.inc +0 -15
index e7ab409f..be5cb4cd 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -6
index 3a5a9af6..5c7ef3b7 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j721s2.inc +0 -9
index e6e4f162..b6d18fe0 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j722s.inc +0 -6
index d49da340..8a02441b 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/j742s2.inc +0 -6
index 9a54e11e..d2de1d0d 100644
@@ -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"
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -9
index 33224ee3..759984ea 100644
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
index 9b85f867..d0f0bd62 100644

meta-ti-bsp/conf/machine/include/k3.inc MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" · line 47

Quoted 4 lines
meta-ti-bsp/conf/machine/include/k3.inc +1 -0
@@ -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?

Quoted 3 lines
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
  IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
  EFI_PROVIDER ?= "grub-efi"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#3 lore raw

Re: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard

Quoted 262 lines · Ryan Eatmon
Quoted 259 lines · Andrew Davis

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.

---

  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(-)
meta-ti-bsp/conf/machine/include/am62axx.inc +0 -0
index e5f827a9..964be0ad 100644
@@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen"

  TFA_K3_SYSTEM_SUSPEND = "1"

meta-ti-bsp/conf/machine/include/am62axx.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/am62dxx.inc +0 -0
index ac4e8e17..fc2ce4a3 100644
@@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx"

  TFA_K3_SYSTEM_SUSPEND = "1"

meta-ti-bsp/conf/machine/include/am62dxx.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/am62pxx.inc +0 -0
index 061d0e67..d59f607d 100644
@@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/am62pxx.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/am62xx.inc +0 -0
index 1eb77b4e..74054a78 100644
@@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/am62xx.inc +0 -9
-# 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"

meta-ti-bsp/conf/machine/include/am64xx.inc +0 -0
index 56b56afe..e353e687 100644
@@ -20,15 +20,6 @@ KERNEL_DEVICETREE = " \
       ti/k3-am642-tqma64xxl-mbax4xxl.dtb \

  "

meta-ti-bsp/conf/machine/include/am64xx.inc +0 -9
-# 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"

meta-ti-bsp/conf/machine/include/am65xx.inc +0 -0
index 99a3b12f..feab624a 100644
@@ -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"

meta-ti-bsp/conf/machine/include/am68.inc +0 -0
index 330a2973..b6d18fe0 100644
@@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/am68.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/am69.inc +0 -0
index 1a19410a..759984ea 100644
@@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/am69.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/j7200.inc +0 -0
index e7ab409f..be5cb4cd 100644
@@ -3,21 +3,6 @@ require conf/machine/include/mc_k3r5.inc

  SOC_FAMILY:append = ":j7200"

meta-ti-bsp/conf/machine/include/j7200.inc +0 -15
-# 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"

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 3a5a9af6..5c7ef3b7 100644
@@ -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

meta-ti-bsp/conf/machine/include/j721e.inc +0 -2
-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"

meta-ti-bsp/conf/machine/include/j721s2.inc +0 -0
index e6e4f162..b6d18fe0 100644
@@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/j721s2.inc +0 -9
-# 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"

meta-ti-bsp/conf/machine/include/j722s.inc +0 -0
index d49da340..8a02441b 100644
@@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/j722s.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/j742s2.inc +0 -0
index 9a54e11e..d2de1d0d 100644
@@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/j742s2.inc +0 -6
-# 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"

meta-ti-bsp/conf/machine/include/j784s4.inc +0 -0
index 33224ee3..759984ea 100644
@@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu"

  require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

meta-ti-bsp/conf/machine/include/j784s4.inc +0 -9
-# 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"

meta-ti-bsp/conf/machine/include/k3.inc +0 -0
index 9b85f867..d0f0bd62 100644
Quoted 9 lines
Quoted 6 lines
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
@@ -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

Quoted 4 lines
Quoted 3 lines

  IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
  EFI_PROVIDER ?= "grub-efi"

#4 lore raw

Re: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard

In reply to Andrew Davis

Hi Andrew,

Quoted 23 lines · Andrew Davis via lists.yoctoproject.org

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.

---
  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>

meta-ti-bsp/conf/machine/include/k3.inc MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" · line 47

Quoted 9 lines
meta-ti-bsp/conf/machine/include/k3.inc +1 -0
index 9b85f867..d0f0bd62 100644
@@ -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

Quoted 12 lines
meta-ti-bsp/conf/machine/include/k3.inc +0 -1
  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: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Re: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard

Quoted 43 lines · Chirag Shilwant

Hi Andrew,

Quoted 23 lines · Andrew Davis via lists.yoctoproject.org

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.

---

  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>

Quoted 8 lines
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
index 9b85f867..d0f0bd62 100644
@@ -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.

Quoted 4 lines

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

Quoted 20 lines

[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

Quoted 11 lines

  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: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#6 lore raw

Re: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard

Quoted 45 lines · Andrew Davis
Quoted 44 lines · Chirag Shilwant

Hi Andrew,

Quoted 23 lines · Andrew Davis via lists.yoctoproject.org

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.

---

  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>

Quoted 9 lines
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
index 9b85f867..d0f0bd62 100644
@@ -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.

Quoted 8 lines
Quoted 4 lines

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.

Quoted 22 lines

Andrew

Quoted 20 lines

[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

Quoted 11 lines

  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: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#7 lore raw
In reply to Andrew Davis
Quoted 17 lines · Andrew Davis

For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here.

---
  meta-ti-bsp/conf/machine/include/j7200.inc |  8 ++------
  meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++----------
  meta-ti-bsp/conf/machine/include/j722s.inc |  5 +----
  3 files changed, 12 insertions(+), 20 deletions(-)
meta-ti-bsp/conf/machine/include/j7200.inc +0 -0
index 3cba71b6..e7ab409f 100644

meta-ti-bsp/conf/machine/include/j7200.inc SOC_FAMILY:append = ":j7200" · line 10

Quoted 7 lines
meta-ti-bsp/conf/machine/include/j7200.inc +1 -3
@@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200"
  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_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
-IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"

Are these files now supported in the current version of the u-boot-ti-mainline_git.bb recipe (2025.04)? Just checking before I try and test it out.

Quoted 60 lines
meta-ti-bsp/conf/machine/include/j7200.inc +1 -3
  # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
-IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+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"
meta-ti-bsp/conf/machine/include/j721e.inc +9 -10
index 30aa2a69..3a5a9af6 100644
@@ -15,22 +15,21 @@ 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_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
-IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+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 = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+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_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+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_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
-IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
 
  TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j722s.inc +1 -4
index e0b77d96..d49da340 100644
@@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
  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_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"
 
  TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#8 lore raw
Quoted 15 lines · Ryan Eatmon
Quoted 12 lines · Andrew Davis

For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here.

---

  meta-ti-bsp/conf/machine/include/j7200.inc |  8 ++------
  meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++----------
  meta-ti-bsp/conf/machine/include/j722s.inc |  5 +----
  3 files changed, 12 insertions(+), 20 deletions(-)
Quoted 14 lines

meta-ti-bsp/conf/machine/include/j7200.inc SOC_FAMILY:append = ":j7200" · line 10

Quoted 11 lines
meta-ti-bsp/conf/machine/include/j7200.inc +0 -0
index 3cba71b6..e7ab409f 100644
@@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200"

  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

meta-ti-bsp/conf/machine/include/j7200.inc +1 -3
-IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
-IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"

Are these files now supported in the current version of the u-boot-ti-mainline_git.bb recipe (2025.04)?  Just checking before I try and test it out.

Yes, most of these missing files landed upstream around v2024.07, u-boot-ti-mainline should be safe.

Andrew

Quoted 53 lines
Quoted 52 lines

  # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE

meta-ti-bsp/conf/machine/include/j7200.inc +1 -3
-IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+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"

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 30aa2a69..3a5a9af6 100644
@@ -15,22 +15,21 @@ 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

meta-ti-bsp/conf/machine/include/j721e.inc +2 -3
-IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
-IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+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

meta-ti-bsp/conf/machine/include/j721e.inc +3 -2
-IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+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

meta-ti-bsp/conf/machine/include/j721e.inc +2 -2
-IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+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

meta-ti-bsp/conf/machine/include/j721e.inc +2 -3
-IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
-IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"

  TFA_BOARD = "generic"

meta-ti-bsp/conf/machine/include/j722s.inc +0 -0
index e0b77d96..d49da340 100644
@@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

  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

meta-ti-bsp/conf/machine/include/j722s.inc +1 -4
-IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"

  TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"

#9 lore raw
In reply to Andrew Davis
Quoted 43 lines · Andrew Davis

For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here.

---
  meta-ti-bsp/conf/machine/include/j7200.inc |  8 ++------
  meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++----------
  meta-ti-bsp/conf/machine/include/j722s.inc |  5 +----
  3 files changed, 12 insertions(+), 20 deletions(-)
meta-ti-bsp/conf/machine/include/j7200.inc +2 -6
index 3cba71b6..e7ab409f 100644
@@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200"
  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_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
-IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+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_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+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"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -2
index 30aa2a69..3a5a9af6 100644
@@ -15,22 +15,21 @@ 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_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
-IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""

meta-ti-bsp/conf/machine/include/j721e.inc IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" · line 24

Quoted 10 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -3
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+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 = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+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"

Andrew,

NAK. This breaks the beaglebone-ai64 build. The meta-beagle/conf/machine/beaglebone-ai64.conf clears the various IMAGE_* variables because the sysfw-j721e_sr1_1-hs-evm.itb file is not created in that flow.

So making this change does not jive with the beaglebone setup. It looks like you need to also clean up those files so that they do not rely on the IMAGE_BOOT_FILES variable...

Not sure. You wanted to do this, so you can negotiate with Denys on the best way to resolve this with your patch.

Quoted 31 lines
meta-ti-bsp/conf/machine/include/j721e.inc +4 -5
  # Since default on J721e is for GP, add a version for SR2.0 HS-FS
-IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+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_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
-IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
 
  TFA_BOARD = "generic"
 
meta-ti-bsp/conf/machine/include/j722s.inc +1 -4
index e0b77d96..d49da340 100644
@@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
  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_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"
 
  TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS