meta-ti-bsp: Add all tiboot3.bin and sysfw.itb variants by wildcard

U-Boot generates all the valid versions of tiboot3.bin and sysfw.itb
based on the given defconfig. The defaults are also picked based on
the board's binman files. No need to duplicate this logic here,
simply deploy what U-Boot generates.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

meta-beagle/conf/machine/beaglebone-ai64.conf

@@ -5,11 +5,6 @@
 require conf/machine/include/j721e.inc
 require conf/machine/include/beagle-bsp.inc
 
-IMAGE_SR1_1_HS_FS_FILES = ""
-IMAGE_SR1_1_HS_SE_FILES = ""
-IMAGE_SR2_HS_FS_FILES = ""
-IMAGE_SR2_HS_SE_FILES = ""
-
 UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig"
 
 SPL_BINARY = "tispl.bin_unsigned"

meta-beagle/conf/machine/beagley-ai.conf

@@ -5,8 +5,6 @@
 require conf/machine/include/j722s.inc
 require conf/machine/include/beagle-bsp.inc
 
-IMAGE_SR1_HS_SE_FILES:bsp-bb_org-6_6 = ""
-
 UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
 
 UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"

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"
 

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"

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"
 

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"
 

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"

meta-ti-bsp/conf/machine/include/am65xx.inc

@@ -25,15 +25,8 @@ KERNEL_DEVICETREE = " \
     ti/k3-am6548-iot2050-advanced.dtb \
 "
 
-IMAGE_BOOT_FILES += "sysfw.itb"
+# Deploy SYSFW and any variants
-
+IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.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

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

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

@@ -3,25 +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_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}"
-
-# 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}"
-
-# 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

@@ -8,29 +8,8 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
-IMAGE_BOOT_FILES += "sysfw.itb"
+# Deploy SYSFW and any variants
-
+IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.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_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}"
-
-# 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}"
-
-# 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}"
-
-# 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}"
 
 TFA_BOARD = "generic"
 

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"

meta-ti-bsp/conf/machine/include/j722s.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 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_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}"
-
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 

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"

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"

meta-ti-bsp/conf/machine/include/k3.inc

@@ -44,7 +44,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-pka-fw"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"