build: Introduce COMBINED_TIFS_BRDCFG build variable for split boardcfg

J7200 supports using a split firmware where TIFS firmware runs on the
DMSC and DM firmware runs on an R5, and each are able to receive their
own boardcfg loaded from the tiboot3.bin image.

Currently COMBINED_SYSFW_BRDCFG can represent both a full set of
boardcfg for platforms using a single DMSC firmware or only the TIFS
boardcfg when using split firmware. To make this less confusing,
introduce a COMBINED_TIFS_BRDCFG build variable to be used only for TIFS
BOARDCFG when using split firmware so that COMBINED_SYSFW_BRDCFG always
represents a complete set of boardcfg.

This allows SoCs to build bootable binaries supporting ROM combined boot
images with both splt TIFS/DM firmware or complete DMSC firmware.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>

2 files changed, 12 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index d51e395e9..df88e43f2 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,7 @@ SOC_BIN_NAMES += $(SOURCES:%.c=%.bin)
 ITB ?= $(binroot)/sysfw-$(SOC)-$(CONFIG).itb
 ITS ?= $(soc_objroot)/$(basename $(notdir $(ITB))).its
 COMBINED_SYSFW_BRDCFG ?= $(soc_objroot)/combined-sysfw-cfg.bin
+COMBINED_TIFS_BRDCFG ?= $(soc_objroot)/combined-tifs-cfg.bin
 COMBINED_DM_BRDCFG ?= $(soc_objroot)/combined-dm-cfg.bin
 
 vpath %.itb $(soc_objroot)
@@ -174,13 +175,21 @@ sysfw.itb: $(ITB)
 soc_objs: $(SOC_OBJS)
 
 $(COMBINED_SYSFW_BRDCFG): $(SOC_BINS)
+        python3 ./scripts/sysfw_boardcfg_blob_creator.py -b $(soc_objroot)/board-cfg.bin -s $(soc_objroot)/sec-cfg.bin -p $(soc_objroot)/pm-cfg.bin -r $(soc_objroot)/rm-cfg.bin -o $@
+
+$(COMBINED_TIFS_BRDCFG): $(SOC_BINS)
         python3 ./scripts/sysfw_boardcfg_blob_creator.py -b $(soc_objroot)/board-cfg.bin -s $(soc_objroot)/sec-cfg.bin -o $@
 
 $(COMBINED_DM_BRDCFG): $(SOC_BINS)
         python3 ./scripts/sysfw_boardcfg_blob_creator.py -p $(soc_objroot)/pm-cfg.bin -r $(soc_objroot)/rm-cfg.bin -o $@
 
-tiboot3.bin: $(SBL) $(SYSFW_PATH) $(COMBINED_SYSFW_BRDCFG) $(COMBINED_DM_BRDCFG)
-        ./scripts/gen_x509_combined_cert.sh -b $(SBL) -l $(SBL_LOADADDDR) -s $(SYSFW_PATH) -m 0x40000 -d $(COMBINED_SYSFW_BRDCFG) -n $(COMBINED_SYSFW_BRDCFG_LOADADDR) -t $(COMBINED_DM_BRDCFG) -y $(COMBINED_DM_BRDCFG_LOADADDR) -k $(KEY) -o $@
+ifneq (,$(COMBINED_SYSFW_BRDCFG_LOADADDR))
+tiboot3.bin: $(SBL) $(SYSFW_PATH) $(COMBINED_SYSFW_BRDCFG)
+        ./scripts/gen_x509_combined_cert.sh -b $(SBL) -l $(SBL_LOADADDDR) -s $(SYSFW_PATH) -m $(LOADADDR) -d $(COMBINED_SYSFW_BRDCFG) -n $(COMBINED_SYSFW_BRDCFG_LOADADDR) -k $(KEY) -o $@
+else
+tiboot3.bin: $(SBL) $(SYSFW_PATH) $(COMBINED_TIFS_BRDCFG) $(COMBINED_DM_BRDCFG)
+        ./scripts/gen_x509_combined_cert.sh -b $(SBL) -l $(SBL_LOADADDDR) -s $(SYSFW_PATH) -m 0x40000 -d $(COMBINED_TIFS_BRDCFG) -n $(COMBINED_TIFS_BRDCFG_LOADADDR) -t $(COMBINED_DM_BRDCFG) -y $(COMBINED_DM_BRDCFG_LOADADDR) -k $(KEY) -o $@
+endif
 
 $(soc_objroot)/%.o: %.c
         $(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@-pre-validated $<
diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
index 03e091c31..3b754f703 100644
--- a/soc/j7200/Makefile
+++ b/soc/j7200/Makefile
@@ -31,7 +31,7 @@
 #
 
 SBL_LOADADDDR ?= 0x41c00000
-COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7f000
+COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
 COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
 LOADADDR ?= 0x40000
 SCIFS = fs