conf/machine/j721e: some BSPs don't support all SR and HS variants

Adjust IMAGE_BOOT_FILES list as some BSPs do not support all combinations
of SR1.1, SR2.0, HS-FS and HS-SE variants.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index a54c3f2f..62487aa9 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -13,20 +13,22 @@ 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"
+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_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
+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_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
+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_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
+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"