diff options
| author | hao.qi <hao.qi@amlogic.com> | 2022-10-08 16:41:29 +0800 |
|---|---|---|
| committer | Liang Ji <liang.ji@amlogic.com> | 2022-10-25 19:55:38 +0800 |
| commit | c1c80b43482d50de676ed4f0681635a944e265bf (patch) | |
| tree | 73c67e525832294ecf67690cee908fa7fa3c5fdf | |
| parent | 4a3a8a85e704c09cad96bc50994d3428779bb7d5 (diff) | |
| download | u-boot-android-tv-14.0.0_r1.tar.gz | |
uboot: only check release key [2/2]android-tv-14.0.0_r1
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>
| -rwxr-xr-x | fip/build_bl33.sh | 6 | ||||
| -rwxr-xr-x | fip/mk_script.sh | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/fip/build_bl33.sh b/fip/build_bl33.sh index f2e853d53e..f77ab402f1 100755 --- a/fip/build_bl33.sh +++ b/fip/build_bl33.sh @@ -45,7 +45,7 @@ function pre_build_uboot() { } 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 @@ function build_uboot() { 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 a3fa65e8a3..9a190daa92 100755 --- a/fip/mk_script.sh +++ b/fip/mk_script.sh @@ -299,7 +299,10 @@ function build() { 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 @@ function bin_path_parser() { 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 |