X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=MAKEALL;h=63f8bef6ca4b5568c271c6100582b18fb329393c;hb=391a741162861a887fd226e53048aad2daed62fd;hp=e6c801cbb88457ec58de8e8f60d20ab392966fe4;hpb=f588bb034d5d3a0417f45965f1aba4d4cf8a2893;p=oweals%2Fu-boot.git

diff --git a/MAKEALL b/MAKEALL
index e6c801cbb8..63f8bef6ca 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -19,6 +19,7 @@ usage()
 	  -l,        --list            List all targets to be built
 	  -m,        --maintainers     List all targets and maintainer email
 	  -M,        --mails           List all targets and all affilated emails
+	  -C,        --check           Enable build checking
 	  -h,        --help            This help output
 
 	Selections by these options are logically ANDed; if the same option
@@ -51,8 +52,8 @@ usage()
 	exit ${ret}
 }
 
-SHORT_OPTS="ha:c:v:s:lmM"
-LONG_OPTS="help,arch:,cpu:,vendor:,soc:,list,maintainers,mails"
+SHORT_OPTS="ha:c:v:s:lmMC"
+LONG_OPTS="help,arch:,cpu:,vendor:,soc:,list,maintainers,mails,check"
 
 # Option processing based on util-linux-2.13/getopt-parse.bash
 
@@ -87,9 +88,9 @@ while true ; do
 	-c|--cpu)
 		# echo "Option CPU: argument \`$2'"
 		if [ "$opt_c" ] ; then
-			opt_c="${opt_c%)} || \$3 == \"$2\")"
+			opt_c="${opt_c%)} || \$3 == \"$2\" || \$3 ~ /$2:/)"
 		else
-			opt_c="(\$3 == \"$2\")"
+			opt_c="(\$3 == \"$2\" || \$3 ~ /$2:/)"
 		fi
 		SELECTED='y'
 		shift 2 ;;
@@ -111,6 +112,9 @@ while true ; do
 		fi
 		SELECTED='y'
 		shift 2 ;;
+	-C|--check)
+		CHECK='C=1'
+		shift ;;
 	-l|--list)
 		ONLY_LIST='y'
 		shift ;;
@@ -201,6 +205,8 @@ LIST=""
 # Keep track of the number of builds and errors
 ERR_CNT=0
 ERR_LIST=""
+WRN_CNT=0
+WRN_LIST=""
 TOTAL_CNT=0
 CURRENT_CNT=0
 OLDEST_IDX=1
@@ -209,14 +215,17 @@ RC=0
 # Helper funcs for parsing boards.cfg
 boards_by_field()
 {
+	FS="[ \t]+"
+	[ -n "$3" ] && FS="$3"
 	awk \
 		-v field="$1" \
 		-v select="$2" \
+		-F "$FS" \
 		'($1 !~ /^#/ && $field == select) { print $1 }' \
 		boards.cfg
 }
 boards_by_arch() { boards_by_field 2 "$@" ; }
-boards_by_cpu()  { boards_by_field 3 "$@" ; }
+boards_by_cpu()  { boards_by_field 3 "$@" "[: \t]+" ; }
 boards_by_soc()  { boards_by_field 6 "$@" ; }
 
 #########################################################################
@@ -328,6 +337,12 @@ LIST_ppc="		\
 
 LIST_SA="$(boards_by_cpu sa1100)"
 
+#########################################################################
+## ARM7 Systems
+#########################################################################
+
+LIST_ARM7="$(boards_by_cpu arm720t)"
+
 #########################################################################
 ## ARM9 Systems
 #########################################################################
@@ -335,16 +350,14 @@ LIST_SA="$(boards_by_cpu sa1100)"
 LIST_ARM9="$(boards_by_cpu arm920t)	\
 	$(boards_by_cpu arm926ejs)	\
 	$(boards_by_cpu arm925t)	\
+	$(boards_by_cpu arm946es)	\
 "
 
 #########################################################################
 ## ARM11 Systems
 #########################################################################
 LIST_ARM11="$(boards_by_cpu arm1136)	\
-	imx31_phycore		\
-	imx31_phycore_eet	\
-	mx31pdk			\
-	smdk6400		\
+	$(boards_by_cpu arm1176)	\
 "
 
 #########################################################################
@@ -365,25 +378,13 @@ LIST_at91="$(boards_by_soc at91)"
 
 LIST_pxa="$(boards_by_cpu pxa)"
 
-LIST_ixp="$(boards_by_cpu ixp)
-	pdnb3		\
-	scpu		\
-"
+LIST_ixp="$(boards_by_cpu ixp)"
 
 #########################################################################
 ## ARM groups
 #########################################################################
 
-LIST_arm="			\
-	${LIST_SA}		\
-	${LIST_ARM9}		\
-	${LIST_ARM10}		\
-	${LIST_ARM11}		\
-	${LIST_ARMV7}	\
-	${LIST_at91}		\
-	${LIST_pxa}		\
-	${LIST_ixp}		\
-"
+LIST_arm="$(boards_by_arch arm)"
 
 #########################################################################
 ## MIPS Systems		(default = big endian)
@@ -391,6 +392,9 @@ LIST_arm="			\
 
 LIST_mips4kc="		\
 	incaip		\
+	incaip_100MHz	\
+	incaip_133MHz	\
+	incaip_150MHz	\
 	qemu_mips	\
 	vct_platinum	\
 	vct_platinum_small	\
@@ -411,7 +415,6 @@ LIST_au1xx0="		\
 	dbau1100	\
 	dbau1500	\
 	dbau1550	\
-	gth2		\
 "
 
 LIST_mips="		\
@@ -464,14 +467,7 @@ LIST_microblaze="$(boards_by_arch microblaze)"
 ## ColdFire Systems
 #########################################################################
 
-LIST_m68k="$(boards_by_arch m68k)
-	EB+MCF-EV123		\
-	EB+MCF-EV123_internal	\
-	M52277EVB		\
-	M5235EVB		\
-	M54451EVB		\
-	M54455EVB		\
-"
+LIST_m68k="$(boards_by_arch m68k)"
 LIST_coldfire=${LIST_m68k}
 
 #########################################################################
@@ -618,6 +614,11 @@ build_target() {
 	target=$1
 	build_idx=$2
 
+	if [ "$ONLY_LIST" == 'y' ] ; then
+		list_target ${target}
+		return
+	fi
+
 	if [ $BUILD_MANY == 1 ] ; then
 		output_dir="${OUTPUT_PREFIX}/${target}"
 		mkdir -p "${output_dir}"
@@ -627,15 +628,10 @@ build_target() {
 
 	export BUILD_DIR="${output_dir}"
 
-	if [ "$ONLY_LIST" == 'y' ] ; then
-		list_target ${target}
-		return
-	fi
-
 	${MAKE} distclean >/dev/null
 	${MAKE} -s ${target}_config
 
-	${MAKE} ${JOBS} all \
+	${MAKE} ${JOBS} ${CHECK} all \
 		>${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR
 
 	# Check for 'make' errors
@@ -647,14 +643,19 @@ build_target() {
 		${MAKE} tidy
 
 		if [ -s ${LOG_DIR}/${target}.ERR ] ; then
-			touch ${OUTPUT_PREFIX}/ERR/${target}
+			cp ${LOG_DIR}/${target}.ERR ${OUTPUT_PREFIX}/ERR/${target}
 		else
 			rm ${LOG_DIR}/${target}.ERR
 		fi
 	else
 		if [ -s ${LOG_DIR}/${target}.ERR ] ; then
-			: $(( ERR_CNT += 1 ))
-			ERR_LIST="${ERR_LIST} $target"
+			if grep -iw error ${LOG_DIR}/${target}.ERR ; then
+				: $(( ERR_CNT += 1 ))
+				ERR_LIST="${ERR_LIST} $target"
+			else
+				: $(( WRN_CNT += 1 ))
+				WRN_LIST="${WRN_LIST} $target"
+			fi
 		else
 			rm ${LOG_DIR}/${target}.ERR
 		fi
@@ -669,16 +670,15 @@ build_target() {
 
 	[ -e "${LOG_DIR}/${target}.ERR" ] && cat "${LOG_DIR}/${target}.ERR"
 
-	#echo "Writing ${donep}${build_idx}"
 	touch "${donep}${build_idx}"
 }
 
 manage_builds() {
 	search_idx=${OLDEST_IDX}
-	#echo "Searching ${OLDEST_IDX} to ${TOTAL_CNT}"
+	if [ "$ONLY_LIST" == 'y' ] ; then return ; fi
+
 	while true; do
 		if [ -e "${donep}${search_idx}" ] ; then
-	#		echo "Found ${donep}${search_idx}"
 			: $(( CURRENT_CNT-- ))
 			[ ${OLDEST_IDX} -eq ${search_idx} ] &&
 				: $(( OLDEST_IDX++ ))
@@ -690,10 +690,8 @@ manage_builds() {
 			[ ${OLDEST_IDX} -eq ${search_idx} ] &&
 				: $(( OLDEST_IDX++ ))
 		fi
-		#echo "Checking search ${search_idx} vs ${TOTAL_CNT}"
 		: $(( search_idx++ ))
 		if [ ${search_idx} -gt ${TOTAL_CNT} ] ; then
-			#echo "Checking current ${CURRENT_CNT} vs ${BUILD_NBUILDS}"
 			if [ ${CURRENT_CNT} -ge ${BUILD_NBUILDS} ] ; then
 				search_idx=${OLDEST_IDX}
 				sleep 1
@@ -720,7 +718,11 @@ build_targets() {
 			: $((CURRENT_CNT += 1))
 			rm -f "${donep}${TOTAL_CNT}"
 			rm -f "${skipp}${TOTAL_CNT}"
-			build_target ${t} ${TOTAL_CNT} &
+			if [ $BUILD_MANY == 1 ] ; then
+				build_target ${t} ${TOTAL_CNT} &
+			else
+				build_target ${t} ${TOTAL_CNT}
+			fi
 		fi
 
 		# We maintain a running count of all the builds we have done.
@@ -742,26 +744,41 @@ build_targets() {
 
 #-----------------------------------------------------------------------
 
+kill_children() {
+	kill -- "-$1"
+
+	exit
+}
+
 print_stats() {
 	if [ "$ONLY_LIST" == 'y' ] ; then return ; fi
 
 	rm -f ${donep}* ${skipp}*
 
 	if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then
-		ERR_LIST=$(ls ${OUTPUT_PREFIX}/ERR/)
-		ERR_CNT=`ls -1 ${OUTPUT_PREFIX}/ERR/ | wc | awk '{print $1}'`
-	else
-		ERR_CNT=0
+		ERR_LIST=`grep -riwl error ${OUTPUT_PREFIX}/ERR/`
+		ERR_LIST=`for f in $ERR_LIST ; do echo -n " $(basename $f)" ; done`
+		ERR_CNT=`echo $ERR_LIST | wc -w | awk '{print $1}'`
+		WRN_LIST=`grep -riwL error ${OUTPUT_PREFIX}/ERR/`
+		WRN_LIST=`for f in $WRN_LIST ; do echo -n " $(basename $f)" ; done`
+		WRN_CNT=`echo $WRN_LIST | wc -w | awk '{print $1}'`
 	fi
 
 	echo ""
 	echo "--------------------- SUMMARY ----------------------------"
 	echo "Boards compiled: ${TOTAL_CNT}"
 	if [ ${ERR_CNT} -gt 0 ] ; then
-		echo "Boards with warnings or errors: ${ERR_CNT} (${ERR_LIST} )"
+		echo "Boards with errors: ${ERR_CNT} (${ERR_LIST} )"
+	fi
+	if [ ${WRN_CNT} -gt 0 ] ; then
+		echo "Boards with warnings but no errors: ${WRN_CNT} (${WRN_LIST} )"
 	fi
 	echo "----------------------------------------------------------"
 
+	if [ $BUILD_MANY == 1 ] ; then
+		kill_children $$ &
+	fi
+
 	exit $RC
 }