commit 46d38f04deccf5364be8c6e66f9cb1e90a2c023c
author wenbo.wang <wenbo.wang@amlogic.com> Fri Jul 19 14:57:05 2024 +0800
committer jenkins <cary.wu@amlogic.com> Wed Aug 21 19:14:40 2024 -0700
tree 3cae22a9f0b9124db1e0706834cee86a0245da5b
parent be0dbf5d1037033c22bbbe098c2319f82e822780

t6d: Verify signed boot flow on PXP of t6d [1/1]

PD#SWPL-177741

Problem:
Verify signed boot flow on PXP of t6d

Solution:
done

Verify:
t6d

Change-Id: I520bbc1ac482400e57b54707e8635ef99d625271
Signed-off-by: wenbo.wang <wenbo.wang@amlogic.com>

t6d/bin/add-dvinit-params.sh

diff --git a/t6d/bin/add-dvinit-params.sh b/t6d/bin/add-dvinit-params.sh
index a5e7f92..6d0497c 100755
--- a/t6d/bin/add-dvinit-params.sh
+++ b/t6d/bin/add-dvinit-params.sh
@@ -33,7 +33,7 @@
 ### Input: payloads ###
 BB1ST_ARGS="${BB1ST_ARGS} --infile-dvinit-params=${BASEDIR_PAYLOAD}"
 
-BB1ST_ARGS="${BB1ST_ARGS} --scs-family=t6d"
+BB1ST_ARGS="${BB1ST_ARGS} --scs-family=s7"
 
 ### Output: blobs ###
 BB1ST_ARGS="${BB1ST_ARGS} --outfile-bb1st=${BASEDIR_OUTPUT_BLOB}"

t6d/bin/gen-boot-blob-bl2-final.sh

diff --git a/t6d/bin/gen-boot-blob-bl2-final.sh b/t6d/bin/gen-boot-blob-bl2-final.sh
index 64415df..b752064 100755
--- a/t6d/bin/gen-boot-blob-bl2-final.sh
+++ b/t6d/bin/gen-boot-blob-bl2-final.sh
@@ -67,7 +67,7 @@
 ### Features, flags and switches ###
 BB1ST_ARGS="${BB1ST_ARGS} --switch-chipset-sign-bl2=0"
 
-BB1ST_ARGS="${BB1ST_ARGS} --scs-family=t6d"
+BB1ST_ARGS="${BB1ST_ARGS} --scs-family=s7"
 
 ### Output: blobs ###
 BB1ST_ARGS="${BB1ST_ARGS} --outfile-bb1st=${BASEDIR_OUTPUT_BLOB}/bb1st${FEAT_BL2_TEMPLATE_TYPE}${CHIPSET_VARIANT_SUFFIX}.bin${postfix}"

t6d/bin/gen-boot-blob-bl2-only.sh

diff --git a/t6d/bin/gen-boot-blob-bl2-only.sh b/t6d/bin/gen-boot-blob-bl2-only.sh
index 7167179..a529b52 100755
--- a/t6d/bin/gen-boot-blob-bl2-only.sh
+++ b/t6d/bin/gen-boot-blob-bl2-only.sh
@@ -62,7 +62,7 @@
 ### Input: pre-generated ProtKey for payloads
 BB1ST_ARGS="${BB1ST_ARGS} --infile-aes256-bl2-payload=${BASEDIR_AESKEY_PROT_BL2}/genkey-prot-bl2.bin"
 
-BB1ST_ARGS="${BB1ST_ARGS} --scs-family=t6d"
+BB1ST_ARGS="${BB1ST_ARGS} --scs-family=s7"
 
 ### Features, flags and switches ###
 

t6d/bin/gen-boot-blobs.sh

diff --git a/t6d/bin/gen-boot-blobs.sh b/t6d/bin/gen-boot-blobs.sh
index 616121e..ffda2ca 100755
--- a/t6d/bin/gen-boot-blobs.sh
+++ b/t6d/bin/gen-boot-blobs.sh
@@ -87,7 +87,7 @@
 	BB1ST_ARGS="${BB1ST_ARGS} --feature-bl2e-sigprot-mode"
 fi
 
-BB1ST_ARGS="${BB1ST_ARGS} --scs-family=t6d"
+BB1ST_ARGS="${BB1ST_ARGS} --scs-family=s7"
 
 ### Output: blobs ###
 BB1ST_ARGS="${BB1ST_ARGS} --outfile-bb1st=${BASEDIR_OUTPUT_BLOB}/bb1st${FEAT_BL2_TEMPLATE_TYPE}${CHIPSET_VARIANT_SUFFIX}.bin${postfix}"

t6d/bin/sign-blx.sh

diff --git a/t6d/bin/sign-blx.sh b/t6d/bin/sign-blx.sh
index 81d6f6f..ae23d8b 100755
--- a/t6d/bin/sign-blx.sh
+++ b/t6d/bin/sign-blx.sh
@@ -93,7 +93,7 @@
 	# select bl2/bl2e sign template
 	FEAT_BL2_TEMPLATE_TYPE=
 	FEAT_BL2E_SIGPROT_MODE=0
-	if [ -z ${chipset_variant} ] || [ ${chipset_variant} == "no_variant" ]; then
+	if [ -z ${chipset_variant} ] || [ ${chipset_variant} == "no_variant" ] || [ ${chipset_variant} == "general" ]; then
 		chipset_variant_suffix=""
 	else
 		chipset_variant_suffix=".${chipset_variant}"