From ae33e3114a1400755ff99ce335cbcc36c902008d Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Wed, 16 Sep 2020 12:01:33 +0800 Subject: [PATCH] scripts: rename fit-mkimg.sh to fit.sh The name style follows other rockchip scripts is better, like: ./scripts/atf.sh ./scripts/loader.sh ./scripts/spl.sh ./scripts/tos.sh ./scripts/uboot.sh Signed-off-by: Joseph Chen Change-Id: I249f67d0b4e385a3f05f9c754bc0a9c371b46910 --- make.sh | 9 +++++---- scripts/{fit-mkimg.sh => fit.sh} | 0 2 files changed, 5 insertions(+), 4 deletions(-) rename scripts/{fit-mkimg.sh => fit.sh} (100%) diff --git a/make.sh b/make.sh index 63bb3c6a6c..6982e711aa 100755 --- a/make.sh +++ b/make.sh @@ -98,6 +98,7 @@ PLAT_TRUST_SIZE= PLAT_TYPE="RKFW" # default SRCTREE=`pwd` +SCRIPT_FIT="${SRCTREE}/scripts/fit.sh" SCRIPT_ATF="${SRCTREE}/scripts/atf.sh" SCRIPT_TOS="${SRCTREE}/scripts/tos.sh" SCRIPT_SPL="${SRCTREE}/scripts/spl.sh" @@ -229,7 +230,7 @@ function process_args() ;; *) #1. FIT scripts args - NUM=$(./scripts/fit-mkimg.sh --arg-check $1) + NUM=$(${SCRIPT_FIT} --arg-check $1) if [ ${NUM} -ne 0 ]; then [ ${NUM} -eq 1 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1" [ ${NUM} -eq 2 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1 $2" @@ -478,7 +479,7 @@ function sub_commands() ;; fit) # Non-secure - ./scripts/fit-mkimg.sh --uboot-itb --boot-itb --no-vboot ${ARG_LIST_FIT} + ${SCRIPT_FIT} --uboot-itb --boot-itb --no-vboot ${ARG_LIST_FIT} exit 0 ;; uboot) @@ -718,10 +719,10 @@ function pack_fit_image() # Verified boot=1: must build both uboot.img and boot.img # Verified boot=0: build uboot.img if grep -q '^CONFIG_FIT_SIGNATURE=y' .config ; then - ./scripts/fit-mkimg.sh --uboot-itb --boot-itb ${ARG_LIST_FIT} + ${SCRIPT_FIT} --uboot-itb --boot-itb ${ARG_LIST_FIT} else rm uboot.img trust*.img -f - ./scripts/fit-mkimg.sh --uboot-itb --no-vboot --no-rebuild ${ARG_LIST_FIT} + ${SCRIPT_FIT} --uboot-itb --no-vboot --no-rebuild ${ARG_LIST_FIT} echo "pack uboot.img okay! Input: ${INI_TRUST}" fi } diff --git a/scripts/fit-mkimg.sh b/scripts/fit.sh similarity index 100% rename from scripts/fit-mkimg.sh rename to scripts/fit.sh