scripts: gen_x509_combined_cert: modify to support multiple boardcfg images

With the new bootflows being introduced, it is possible for boards to
have multiple boardcfg images provided. Modify the
gen_x509_combined_cert script to accept two different boardcfg binaries
and load them to the defined addresses.

This mandates that all platforms using combined bootflow will use the
split boardcfg images.

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

3 files changed, 43 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index d827e6a8f..7f8bdee09 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,8 @@ SOC_BIN_NAMES += $(SOURCES:%.c=%.bin)
 
 ITB ?= $(binroot)/sysfw-$(SOC)-$(CONFIG).itb
 ITS ?= $(soc_objroot)/$(basename $(notdir $(ITB))).its
-COMBINED_BRDCFG ?= $(soc_objroot)/combined-cfg.bin
+COMBINED_SYSFW_BRDCFG ?= $(soc_objroot)/combined-sysfw-cfg.bin
+COMBINED_DM_BRDCFG ?= $(soc_objroot)/combined-dm-cfg.bin
 
 vpath %.itb $(soc_objroot)
 vpath %.bin $(soc_objroot)
@@ -172,11 +173,14 @@ sysfw.itb: $(ITB)
 
 soc_objs: $(SOC_OBJS)
 
-$(COMBINED_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_SYSFW_BRDCFG): $(SOC_BINS)
+        python3 ./scripts/sysfw_boardcfg_blob_creator.py -b $(soc_objroot)/board-cfg.bin -s $(soc_objroot)/sec-cfg.bin -o $@
 
-tiboot3.bin: $(SBL) $(SYSFW_PATH) $(COMBINED_BRDCFG)
-        ./scripts/gen_x509_combined_cert.sh -b $(SBL) -l $(SBL_LOADADDDR) -s $(SYSFW_PATH) -m 0x40000 -d $(COMBINED_BRDCFG) -n $(COMBINED_BRDCFG_LOADADDR) -k $(KEY) -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 $@
 
 $(soc_objroot)/%.o: %.c
         $(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@-pre-validated $<
diff --git a/scripts/gen_x509_combined_cert.sh b/scripts/gen_x509_combined_cert.sh
index 3fed87b0b..c6c596fdb 100755
--- a/scripts/gen_x509_combined_cert.sh
+++ b/scripts/gen_x509_combined_cert.sh
@@ -99,9 +99,11 @@ options_help[s]="SYSFW: Bin file corresponding to sysfw image"
 options_help[m]="SYSFW loadaddress: SYSFW image load address"
 options_help[d]="SYSFW_DATA: Bin file corresponding to combined board configurations"
 options_help[n]="SYSFW_DATA loadaddr: Combine board configuration load address"
+options_help[t]="DM_DATA: Bin file corresponding to combined board configurations for RM and PM. If this is used, RM and PM do not need to be provided as part of SYSFW_DATA."
+options_help[y]="DM_DATA loadaddr: Combine RM and PM blob board configuration load address"
 options_help[k]="key_file:file with key inside it. If not provided script generates a random key."
 
-while getopts "b:l:s:m:d:n:k:o:h" opt
+while getopts "b:l:s:m:d:n:k:o:h:t:y:" opt
 do
         case $opt in
         b)
@@ -122,6 +124,12 @@ do
         n)
                 SYSFW_DATA_LOADADDR=$OPTARG
         ;;
+        t)
+                DM_DATA=$OPTARG
+        ;;
+        y)
+                DM_DATA_LOADADDR=$OPTARG
+        ;;
         k)
                 KEY=$OPTARG
         ;;
@@ -182,7 +190,12 @@ SYSFW_ADDR=`printf "%08x" $SYSFW_LOADADDR`
 SYSFW_DATA_SHA_VAL=`openssl dgst -$SHA -hex $SYSFW_DATA | sed -e "s/^.*= //g"`
 SYSFW_DATA_SIZE=`cat $SYSFW_DATA | wc -c`
 SYSFW_DATA_ADDR=`printf "%08x" $SYSFW_DATA_LOADADDR`
-TOTAL_SIZE=$(expr $SBL_SIZE + $SYSFW_SIZE + $SYSFW_DATA_SIZE)
+
+DM_DATA_SHA_VAL=`openssl dgst -$SHA -hex $DM_DATA | sed -e "s/^.*= //g"`
+DM_DATA_SIZE=`cat $DM_DATA | wc -c`
+DM_DATA_ADDR=`printf "%08x" $DM_DATA_LOADADDR`
+
+TOTAL_SIZE=$(expr $SBL_SIZE + $SYSFW_SIZE + $SYSFW_DATA_SIZE + $DM_DATA_SIZE)
 
 # Generate x509 Template
 gen_template() {
@@ -213,10 +226,11 @@ cat << 'EOF' > $TEMP_X509
 
  [ext_boot_info]
  extImgSize=INTEGER:TOTAL_IMAGE_LENGTH
- numComp=INTEGER:3
+ numComp=INTEGER:4
  sbl=SEQUENCE:sbl
  sysfw=SEQUENCE:sysfw
  sysfw_data=SEQUENCE:sysfw_data
+ dm_data=SEQUENCE:dm_data
 
  [sbl]
  compType = INTEGER:1
@@ -244,6 +258,15 @@ cat << 'EOF' > $TEMP_X509
  compSize = INTEGER:SYSFW_DATA_IMAGE_SIZE
  shaType  = OID:SYSFW_DATA_IMAGE_SHA_OID
  shaValue = FORMAT:HEX,OCT:SYSFW_DATA_IMAGE_SHA_VAL
+
+ [dm_data]
+ compType = INTEGER:17
+ bootCore = INTEGER:16
+ compOpts = INTEGER:0
+ destAddr = FORMAT:HEX,OCT:DM_DATA_DEST_ADDR
+ compSize = INTEGER:DM_DATA_IMAGE_SIZE
+ shaType  = OID:DM_DATA_IMAGE_SHA_OID
+ shaValue = FORMAT:HEX,OCT:DM_DATA_IMAGE_SHA_VAL
 EOF
 }
 
@@ -264,6 +287,11 @@ gen_cert() {
         sed -i "s/SYSFW_DATA_IMAGE_SIZE/$SYSFW_DATA_SIZE/" $TEMP_X509
         sed -i "s/SYSFW_DATA_IMAGE_SHA_OID/$SHA_OID/" $TEMP_X509
         sed -i "s/SYSFW_DATA_IMAGE_SHA_VAL/$SYSFW_DATA_SHA_VAL/" $TEMP_X509
+        #echo $DM_DATA_ADDR $DM_DATA_SIZE $DM_DATA_SHA_VAL
+        sed -i "s/DM_DATA_DEST_ADDR/$DM_DATA_ADDR/" $TEMP_X509
+        sed -i "s/DM_DATA_IMAGE_SIZE/$DM_DATA_SIZE/" $TEMP_X509
+        sed -i "s/DM_DATA_IMAGE_SHA_OID/$SHA_OID/" $TEMP_X509
+        sed -i "s/DM_DATA_IMAGE_SHA_VAL/$DM_DATA_SHA_VAL/" $TEMP_X509
         #echo $TOTAL_SIZE
         sed -i "s/TOTAL_IMAGE_LENGTH/$TOTAL_SIZE/" $TEMP_X509
         openssl req -new -x509 -key $KEY -nodes -outform DER -out $CERT -config $TEMP_X509 -$SHA
@@ -271,7 +299,7 @@ gen_cert() {
 
 gen_template
 gen_cert
-cat $CERT $SBL $SYSFW $SYSFW_DATA > $OUTPUT
+cat $CERT $SBL $SYSFW $SYSFW_DATA $DM_DATA > $OUTPUT
 
 echo "SUCCESS: Image $OUTPUT generated."
 
diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
index 8a1005a64..d8904d24d 100644
--- a/soc/j7200/Makefile
+++ b/soc/j7200/Makefile
@@ -31,7 +31,8 @@
 #
 
 SBL_LOADADDDR ?= 0x41c00000
-COMBINED_BRDCFG_LOADADDR ?= 0x7f000
+COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7f000
+COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
 LOADADDR ?= 0x40000
 
 .PHONY: all