uboot: only check release key [2/2]
PD#SWPL-96737
BUG=247412169
Problem:
only check release key for signed
Solution:
Ensure that our internal board is also started using usb burning
(locked status) by compiling the parameter: --testkey.
Verify:
adt4
Change-Id: I0373965ed0e715ca2e067222ff9852e93b322062
Signed-off-by: hao.qi <hao.qi@amlogic.com>
diff --git a/fip/build_bl33.sh b/fip/build_bl33.sh
index f2e853d..f77ab40 100755
--- a/fip/build_bl33.sh
+++ b/fip/build_bl33.sh
@@ -45,7 +45,7 @@
}
function build_uboot() {
- echo "Build uboot...Please Wait...$1...$2...$3...$4...$5"
+ echo "Build uboot...Please Wait...$1...$2...$3...$4...$5...$6"
mkdir -p ${FIP_BUILD_FOLDER}
cd ${UBOOT_SRC_FOLDER}
if [[ "${SCRIPT_ARG_CHIPSET_VARIANT}" =~ "nocs" ]] || [[ "${CONFIG_CHIPSET_VARIANT}" =~ "nocs" ]]; then
@@ -55,11 +55,11 @@
if [ "${CONFIG_MDUMP_COMPRESS}" = "1" ]; then
CONFIG_MDUMP_COMPRESS=1
echo "### BL33 CONFIG_MDUMP_COMPRESS = 1 ###"
- make -j SYSTEMMODE=$1 AVBMODE=$2 BOOTCTRLMODE=$3 FASTBOOTMODE=$4 AVB2RECOVERY=$5 CHIPMODE=${CONFIG_CHIP_NOCS} \
+ make -j SYSTEMMODE=$1 AVBMODE=$2 BOOTCTRLMODE=$3 FASTBOOTMODE=$4 AVB2RECOVERY=$5 TESTKEY=$6 CHIPMODE=${CONFIG_CHIP_NOCS} \
CONFIG_MDUMP_COMPRESS=${CONFIG_MDUMP_COMPRESS} # &> /dev/null
else
echo "### BL33 CONFIG_MDUMP_COMPRESS = 0 ###"
- make -j SYSTEMMODE=$1 AVBMODE=$2 BOOTCTRLMODE=$3 FASTBOOTMODE=$4 AVB2RECOVERY=$5 CHIPMODE=${CONFIG_CHIP_NOCS} # &> /dev/null
+ make -j SYSTEMMODE=$1 AVBMODE=$2 BOOTCTRLMODE=$3 FASTBOOTMODE=$4 AVB2RECOVERY=$5 TESTKEY=$6 CHIPMODE=${CONFIG_CHIP_NOCS} # &> /dev/null
fi
if [ "${CONFIG_SUPPORT_BL33Z}" = "1" ]; then
diff --git a/fip/mk_script.sh b/fip/mk_script.sh
index a3fa65e..9a190da 100755
--- a/fip/mk_script.sh
+++ b/fip/mk_script.sh
@@ -299,7 +299,10 @@
if [ ! $CONFIG_AVB2_RECOVERY ]; then
CONFIG_AVB2_RECOVERY=null
fi
- build_uboot ${CONFIG_SYSTEM_AS_ROOT} ${CONFIG_AVB2} ${CONFIG_CMD_BOOTCTOL_VAB} ${CONFIG_FASTBOOT_WRITING_CMD} ${CONFIG_AVB2_RECOVERY}
+ if [ ! $CONFIG_TESTKEY ]; then
+ CONFIG_TESTKEY=null
+ fi
+ build_uboot ${CONFIG_SYSTEM_AS_ROOT} ${CONFIG_AVB2} ${CONFIG_CMD_BOOTCTOL_VAB} ${CONFIG_FASTBOOT_WRITING_CMD} ${CONFIG_AVB2_RECOVERY} ${CONFIG_TESTKEY}
# source other configs after uboot compile
init_variable_late
@@ -634,6 +637,11 @@
echo "export CONFIG_AVB2_RECOVERY"
export CONFIG_AVB2_RECOVERY=1
continue ;;
+ --testkey)
+ CONFIG_TESTKEY=1
+ echo "export CONFIG_TESTKEY"
+ export CONFIG_TESTKEY=1
+ continue ;;
*)
esac
done