qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <chenjh@rock-chips.com>
Change-Id: I249f67d0b4e385a3f05f9c754bc0a9c371b46910
This commit is contained in:
Joseph Chen 2020-09-16 12:01:33 +08:00
parent 3a02727caf
commit ae33e3114a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make.sh
View File

@ -98,6 +98,7 @@ PLAT_TRUST_SIZE=
PLAT_TYPE="RKFW" # default PLAT_TYPE="RKFW" # default
SRCTREE=`pwd` SRCTREE=`pwd`
SCRIPT_FIT="${SRCTREE}/scripts/fit.sh"
SCRIPT_ATF="${SRCTREE}/scripts/atf.sh" SCRIPT_ATF="${SRCTREE}/scripts/atf.sh"
SCRIPT_TOS="${SRCTREE}/scripts/tos.sh" SCRIPT_TOS="${SRCTREE}/scripts/tos.sh"
SCRIPT_SPL="${SRCTREE}/scripts/spl.sh" SCRIPT_SPL="${SRCTREE}/scripts/spl.sh"
@ -229,7 +230,7 @@ function process_args()
;; ;;
*) *)
#1. FIT scripts args #1. FIT scripts args
NUM=$(./scripts/fit-mkimg.sh --arg-check $1) NUM=$(${SCRIPT_FIT} --arg-check $1)
if [ ${NUM} -ne 0 ]; then if [ ${NUM} -ne 0 ]; then
[ ${NUM} -eq 1 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1" [ ${NUM} -eq 1 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1"
[ ${NUM} -eq 2 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1 $2" [ ${NUM} -eq 2 ] && ARG_LIST_FIT="${ARG_LIST_FIT} $1 $2"
@ -478,7 +479,7 @@ function sub_commands()
;; ;;
fit) fit)
# Non-secure # 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 exit 0
;; ;;
uboot) uboot)
@ -718,10 +719,10 @@ function pack_fit_image()
# Verified boot=1: must build both uboot.img and boot.img # Verified boot=1: must build both uboot.img and boot.img
# Verified boot=0: build uboot.img # Verified boot=0: build uboot.img
if grep -q '^CONFIG_FIT_SIGNATURE=y' .config ; then 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 else
rm uboot.img trust*.img -f 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}" echo "pack uboot.img okay! Input: ${INI_TRUST}"
fi fi
} }

0
scripts/fit-mkimg.sh → scripts/fit.sh
View File