From 496a6e1e02ce707a7e77394dba2e3c109bfd326e Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 10 Jul 2020 09:36:54 +0800 Subject: [PATCH] make.sh: support get loader and trust ini from .config Signed-off-by: Joseph Chen Change-Id: Ia68f394e19565af5e518387e356f58ac24e4b09e --- make.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/make.sh b/make.sh index 1401e573d6..4d4a7524ae 100755 --- a/make.sh +++ b/make.sh @@ -499,6 +499,7 @@ function fixup_platform_configure() fi } +# Priority: default < CHIP_TYPE_FIXUP_TABLE() < defconfig < make.sh args function select_ini_file() { # default @@ -509,6 +510,16 @@ function select_ini_file() INI_TRUST=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TOS.ini fi + # defconfig + NAME=`sed -n "/CONFIG_LOADER_INI=/s/CONFIG_LOADER_INI=//p" .config |tr -d '\r' | tr -d '"'` + if [ ! -z "${NAME}" ]; then + INI_LOADER=${RKBIN}/RKBOOT/${NAME} + fi + NAME=`sed -n "/CONFIG_TRUST_INI=/s/CONFIG_TRUST_INI=//p" .config |tr -d '\r' | tr -d '"'` + if [ ! -z "${NAME}" ]; then + INI_TRUST=${RKBIN}/RKTRUST/${NAME} + fi + # args if [ "${ARG_INI_TRUST}" != "" ]; then INI_TRUST=${ARG_INI_TRUST}