commit 54c3c85b19a45d45f0f878af84a64cab1380e498
author Zhongfu Luo <zhongfu.luo@amlogic.com> Thu Aug 29 14:47:27 2024 +0800
committer Zhongfu Luo <zhongfu.luo@amlogic.com> Sat Sep 28 19:21:12 2024 -0700
tree 91e49918f44021f7b59ef8d0ca9d2690d8e4e965
parent 18201d4500c906c9d1d987b55d3d55d7545310e7

FIP: S6: signing tool support arb sub mask [1/1]

PD#SWPL-183751

Problem:
S6: signing tool support arb sub mask

Solution:
S6: signing tool support arb sub mask

Verify:
S6 BL208

Change-Id: I9a78cb9767efc3cb54b74dd68dc9ea5c16259fe0
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>

s6/bin/device-vendor-scs-signing.sh

diff --git a/s6/bin/device-vendor-scs-signing.sh b/s6/bin/device-vendor-scs-signing.sh
index 668e572..8785f94 100755
--- a/s6/bin/device-vendor-scs-signing.sh
+++ b/s6/bin/device-vendor-scs-signing.sh
@@ -377,6 +377,7 @@
 	export DEVICE_SCS_VERS=${DEVICE_SCS_VERS}
 	export DEVICE_TEE_VERS=${DEVICE_TEE_VERS}
 	export DEVICE_REE_VERS=${DEVICE_REE_VERS}
+	export DEVICE_SCS_LVL1CERT_VERS_SUBMASK=${DEVICE_SCS_LVL1CERT_VERS_SUBMASK}
 fi
 
 #export DEVICE_SCS_KEY_TOP=$(pwd)/${key_dir}

s6/generate-binaries/bin/gen-boot-blobs.sh

diff --git a/s6/generate-binaries/bin/gen-boot-blobs.sh b/s6/generate-binaries/bin/gen-boot-blobs.sh
index 3551615..d799a16 100755
--- a/s6/generate-binaries/bin/gen-boot-blobs.sh
+++ b/s6/generate-binaries/bin/gen-boot-blobs.sh
@@ -98,6 +98,9 @@
 BB1ST_ARGS="${BB1ST_ARGS} --val-device-vendor-segid=${DEVICE_VENDOR_SEGID}"
 BB1ST_ARGS="${BB1ST_ARGS} --val-device-scs-vers=${DEVICE_SCS_VERS}"
 BB1ST_ARGS="${BB1ST_ARGS} --val-device-tee-vers=${DEVICE_TEE_VERS}"
+if  [ "1" == "${DEVICE_SCS_LVL1CERT_VERS_SUBMASK}" ]; then
+BB1ST_ARGS="${BB1ST_ARGS} --switch-device-lvl1cert-vers-submask=1"
+fi
 
 ### Output: blobs ###
 BB1ST_ARGS="${BB1ST_ARGS} --outfile-bb1st=${BASEDIR_OUTPUT_BLOB}/bb1st${DEVICE_STORAGE_SUFFIX}${DEVICE_VARIANT_SUFFIX}.bin${output_postfix}"

s6/generate-device-keys/export_signing_keys_and_sign_template.sh

diff --git a/s6/generate-device-keys/export_signing_keys_and_sign_template.sh b/s6/generate-device-keys/export_signing_keys_and_sign_template.sh
index 9a74f69..a8cabaf 100755
--- a/s6/generate-device-keys/export_signing_keys_and_sign_template.sh
+++ b/s6/generate-device-keys/export_signing_keys_and_sign_template.sh
@@ -148,7 +148,7 @@
 
 if [ -s "${arb_config}" ]; then
     source ${arb_config}
-    boot_blobs_arb_args="--device-scs-segid ${DEVICE_SCS_SEGID} --device-vendor-segid ${DEVICE_VENDOR_SEGID} --device-scs-vers ${DEVICE_SCS_VERS} --device-tee-vers ${DEVICE_TEE_VERS}"
+    boot_blobs_arb_args="--device-scs-segid ${DEVICE_SCS_SEGID} --device-vendor-segid ${DEVICE_VENDOR_SEGID} --device-scs-vers ${DEVICE_SCS_VERS} --device-tee-vers ${DEVICE_TEE_VERS} --device-lvl1cert-vers-submask ${DEVICE_SCS_LVL1CERT_VERS_SUBMASK}"
     device_fip_arb_args="--device-vendor-segid ${DEVICE_VENDOR_SEGID} --device-tee-vers ${DEVICE_TEE_VERS} --device-ree-vers ${DEVICE_REE_VERS}"
 fi