From 69b6e59094804837e7b9aeddd37415350cf34096 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Wed, 8 Apr 2020 19:30:43 +0800
Subject: [PATCH] make.sh: optimise fit

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I527656dbcd550c5520edb8e5a677854d9623cf55
---
 make.sh | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/make.sh b/make.sh
index e4fea170af..5ca14a7884 100755
--- a/make.sh
+++ b/make.sh
@@ -152,7 +152,7 @@ prepare()
 
 	case $BOARD in
 		# Parse from exit .config
-		''|elf*|loader*|spl*|itb|debug*|trust|uboot|map|sym|env|EXT_DTB=*)
+		''|elf*|loader*|spl*|itb|debug*|trust|uboot|map|sym|env|EXT_DTB=*|fit*)
 		if [ ! -f .config ]; then
 			echo
 			echo "Build failed, Can't find .config"
@@ -171,7 +171,7 @@ prepare()
 		;;
 
 		#Subcmd
-		''|elf*|loader*|spl*|itb|debug*|trust*|uboot|map|sym|env|EXT_DTB=*)
+		''|elf*|loader*|spl*|itb|debug*|trust*|uboot|map|sym|env|EXT_DTB=*|fit*)
 		;;
 
 		*)
@@ -207,6 +207,10 @@ prepare()
 		echo "	3. Download full release SDK repository"
 		exit 1
 	fi
+
+	if grep  -q '^CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y' .config ; then
+		PACK_FORMAT="fit"
+	fi
 }
 
 select_toolchain()
@@ -269,6 +273,11 @@ sub_commands()
 		exit 0
 		;;
 
+		fit)
+		./scripts/fit-vboot.sh $*
+		exit 0
+		;;
+
 		map)
 		cat ${map} | less
 		exit 0
@@ -604,12 +613,16 @@ pack_loader_image()
 		return;
 	fi
 
-	cd ${RKBIN}
-
-	${RKTOOLS}/boot_merger ${BIN_PATH_FIXUP} $ini
-	echo "pack loader okay! Input: $ini"
-
-	cd - && mv ${RKBIN}/*_loader_*.bin ./
+	if [ "$PACK_FORMAT" = "rk" ]; then
+		cd ${RKBIN}
+		${RKTOOLS}/boot_merger ${BIN_PATH_FIXUP} $ini
+		cd - && mv ${RKBIN}/*_loader_*.bin ./
+		echo "pack loader okay! Input: $ini"
+	else
+		./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild >/dev/null
+		file=`ls *loader*.bin`
+		echo "pack $file okay! Input: $ini"
+	fi
 }
 
 pack_32bit_trust_image()
@@ -646,14 +659,7 @@ pack_32bit_trust_image()
 	TOS=$(echo ${TOS} | sed "s/tools\/rk_tools\//\.\//g")
 	TOS_TA=$(echo ${TOS_TA} | sed "s/tools\/rk_tools\//\.\//g")
 
-	FORMAT=`sed -n "/FIT=/s/FIT=//p" ${ini} |tr -d '\r'`
-	if [ "$FORMAT" = "1" ]; then
-		PACK_FORMAT="fit"
-		./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild >/dev/null
-		ls uboot.img >/dev/null 2>&1 && rm uboot.img -rf
-		ls trust.img >/dev/null 2>&1 && rm trust.img -rf
-		echo "pack uboot.fit (with uboot trust) okay! Input: ${ini}"
-	else
+	if [ "$PACK_FORMAT" = "rk" ]; then
 		if [ $TOS_TA ]; then
 			${RKTOOLS}/loaderimage --pack --trustos ${RKBIN}/${TOS_TA} ${TEE_OUTPUT} ${TEE_LOAD_ADDR} ${PLATFORM_TRUST_IMG_SIZE}
 		elif [ $TOS ]; then
@@ -664,6 +670,11 @@ pack_32bit_trust_image()
 		fi
 
 		echo "pack trust okay! Input: ${ini}"
+	else
+		./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild >/dev/null
+		ls uboot.img >/dev/null 2>&1 && rm uboot.img -rf
+		ls trust.img >/dev/null 2>&1 && rm trust.img -rf
+		echo "pack uboot.fit (with uboot trust) okay! Input: ${ini}"
 	fi
 
 	echo