From 30b04afc78b7b83a601dea5974bbefa8e9d731f9 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Wed, 13 Jun 2018 19:28:58 +0800
Subject: [PATCH] make.sh: support "./make.sh" build without [board] option

this default use exist .config to build project. because users
maybe don't like their .config to be override after "make menuconfig"
change.

Only one SoC in the .config is allowed, otherwise still use
"./make.sh [board]".

Change-Id: Ib65a4b6d6f84b822f6bdaf84b9784521fbf200e9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 make.sh | 66 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/make.sh b/make.sh
index 9eee27c9d5..b2b2ec30da 100755
--- a/make.sh
+++ b/make.sh
@@ -5,7 +5,7 @@ SUBCMD=$2
 RKCHIP=${BOARD##*-}
 RKCHIP=$(echo ${RKCHIP} | tr '[a-z]' '[A-Z]')
 JOB=`sed -n "N;/processor/p" /proc/cpuinfo|wc -l`
-SUPPROT_LIST=`ls configs/*-[r,p][x,v,k][0-9][0-9]*_defconfig`
+SUPPORT_LIST=`ls configs/*-[r,p][x,v,k][0-9][0-9]*_defconfig`
 
 ########################################### User can modify #############################################
 # User's rkbin tool relative path
@@ -42,26 +42,53 @@ PLATFORM_AARCH32=
 
 prepare()
 {
-	local absolute_path cmd
+	local absolute_path cmd count
+
+	# Assign output directory
+	cmd=${SUBCMD%=*}
+	if [ "${cmd}" = 'O' ]; then
+		OUTDIR=${SUBCMD#*=}
+		OUTOPT=O=${OUTDIR}
+	else
+		OUTDIR=.
+	fi
 
 	# Check invalid args and help
-	if [ "$BOARD" = '--help' -o "$BOARD" = '-h' -o "$BOARD" = '--h' -o "$BOARD" = '' ]; then
+	if [ "$BOARD" = '--help' -o "$BOARD" = '-help' -o "$BOARD" = 'help' -o "$BOARD" = '-h' -o "$BOARD" = '--h' ]; then
 		echo
 		echo "Usage: ./make.sh [board]"
 		echo "Example:"
+		echo "./make.sh		 ---- build with exist .config"
 		echo "./make.sh evb-rk3399     ---- build for evb-rk3399_defconfig"
 		echo "./make.sh firefly-rk3288 ---- build for firefly-rk3288_defconfig"
 		exit 1
-	elif [ ! -f configs/${BOARD}_defconfig ]; then
+	elif [ $BOARD ] && [ ! -f configs/${BOARD}_defconfig ]; then
+		echo
 		echo "Can't find: configs/${BOARD}_defconfig"
 		echo
-		echo "*************** Support list ***************"
-		echo "${SUPPROT_LIST}"
+		echo "******** Rockchip Support List *************"
+		echo "${SUPPORT_LIST}"
 		echo "********************************************"
 		echo
 		exit 1
 	fi
 
+	# Get RKCHIP from exist .config file
+	if [ "$RKCHIP" = '' ]; then
+		count=`grep -c '^CONFIG_ROCKCHIP_[R,P][X,V,K][0-9][0-9]' ${OUTDIR}/.config`
+		RKCHIP=`grep '^CONFIG_ROCKCHIP_[R,P][X,V,K][0-9][0-9]' ${OUTDIR}/.config`
+		if [ $count -gt 1 ]; then
+			echo "Find $count SoC in .config file:"
+			echo "$RKCHIP"
+			echo
+			echo "I'm confused, please compile with [board], like: ./make.sh [board]"
+			exit 1
+		else
+			RKCHIP=${RKCHIP%=*}
+			RKCHIP=${RKCHIP##*_}
+		fi
+	fi
+
 	# Initialize RKBIN and RKTOOLS
 	if [ -d ${RKBIN_TOOLS} ]; then
 		absolute_path=$(cd `dirname ${RKBIN_TOOLS}`; pwd)
@@ -76,14 +103,13 @@ prepare()
 		echo "	3. Download full release SDK repository"
 		exit 1
 	fi
+}
 
-	# Assign output directory
-	cmd=${SUBCMD%=*}
-	if [ "${cmd}" = 'O' ]; then
-		OUTDIR=${SUBCMD#*=}
-		OUTOPT=O=${OUTDIR}
-	else
-		OUTDIR=.
+make_defconfig()
+{
+	if [ $BOARD ]; then
+		echo "make for ${BOARD}_defconfig by -j${JOB}"
+		make ${BOARD}_defconfig ${OUTOPT}
 	fi
 }
 
@@ -279,9 +305,18 @@ pack_trust_image()
 	fi
 }
 
+finish()
+{
+	echo
+	if [ "$BOARD" = '' ]; then
+		echo "Platform ${RKCHIP}${PLATFORM_AARCH32} is build OK, with exist .config"
+	else
+		echo "Platform ${RKCHIP}${PLATFORM_AARCH32} is build OK, with new .config(make ${BOARD}_defconfig)"
+	fi
+}
+
 prepare
-echo "make for ${BOARD}_defconfig by -j${JOB}"
-make ${BOARD}_defconfig ${OUTOPT}
+make_defconfig
 select_toolchain
 fixup_platform_configure
 sub_commands
@@ -289,3 +324,4 @@ make CROSS_COMPILE=${TOOLCHAIN_GCC}  all --jobs=${JOB} ${OUTOPT}
 pack_uboot_image
 pack_loader_image
 pack_trust_image
+finish