build.sh: minor cleanup commands (#45)

Signed-off-by: Tianling Shen <[email protected]>

build.sh

@@ -19,88 +19,81 @@ command -v python3
 [ "$?" != "0" ] && { echo "Error: Python is not installed on this system."; exit 0; }
 
 echo "Trying cross compiler..."
-command -v ${TOOLCHAIN}gcc
-[ "$?" != "0" ] && { echo ${TOOLCHAIN}gcc not found!; exit 0; }
-export CROSS_COMPILE=$TOOLCHAIN
+command -v "${TOOLCHAIN}gcc"
+[ "$?" != "0" ] && { echo "${TOOLCHAIN}gcc not found!"; exit 0; }
+export CROSS_COMPILE="$TOOLCHAIN"
 
-UBOOT_CFG="${SOC}_${BOARD}_defconfig"
 ATF_CFG="${SOC}_${BOARD}_defconfig"
+UBOOT_CFG="${SOC}_${BOARD}_defconfig"
+for file in "$ATF_DIR/configs/$ATF_CFG" "$UBOOT_DIR/configs/$UBOOT_CFG"; do
+	if [ ! -f "$file" ]; then
+		echo "$file not found!"
+		exit 1
+	fi
+done
+
 if grep -q "CONFIG_FLASH_DEVICE_EMMC=y" $ATF_DIR/configs/$ATF_CFG ; then
 	# No fixed-mtdparts or multilayout for EMMC
 	fixedparts=0
 	multilayout=0
-	echo "Building for: ${SOC}_${BOARD}"
-	echo "u-boot dir: $UBOOT_DIR"
-	echo "atf dir: $ATF_DIR"
 else
 	# Build fixed-mtdparts by default for NAND
 	fixedparts=${FIXED_MTDPARTS:-1}
 	multilayout=${MULTI_LAYOUT:-0}
 	if [ "$multilayout" = "1" ]; then
 		UBOOT_CFG="${SOC}_${BOARD}_multi_layout_defconfig"
 	fi
-	echo "Building for: ${SOC}_${BOARD}, fixed-mtdparts: $fixedparts, multi-layout: $multilayout"
-	echo "u-boot dir: $UBOOT_DIR"
-	echo "atf dir: $ATF_DIR"
 fi
+echo "Building for: ${SOC}_${BOARD}, fixed-mtdparts: $fixedparts, multi-layout: $multilayout"
+echo "u-boot dir: $UBOOT_DIR"
+echo "atf dir: $ATF_DIR"
 
-
-if [ ! -f $UBOOT_DIR/configs/$UBOOT_CFG ]; then
-	echo "$UBOOT_DIR/configs/$UBOOT_CFG not found!"
-	exit 1
+echo "Build u-boot..."
+rm -f "$UBOOT_DIR/u-boot.bin"
+cp -f "$UBOOT_DIR/configs/$UBOOT_CFG" "$UBOOT_DIR/.config"
+if [ "$fixedparts" = "1" ]; then
+	echo "Build u-boot with fixed-mtdparts!"
+	echo "CONFIG_MEDIATEK_UBI_FIXED_MTDPARTS=y" >> "$UBOOT_DIR/.config"
+	echo "CONFIG_MTK_FIXED_MTD_MTDPARTS=y" >> "$UBOOT_DIR/.config"
+fi
+make -C "$UBOOT_DIR" olddefconfig
+make -C "$UBOOT_DIR" -j $(nproc) all
+if [ -f "$UBOOT_DIR/u-boot.bin" ]; then
+	cp -f "$UBOOT_DIR/u-boot.bin" "$ATF_DIR/u-boot.bin"
+	echo "u-boot build done!"
 else
-	echo "Build u-boot..."
-	rm -f $UBOOT_DIR/u-boot.bin
-	cp -f $UBOOT_DIR/configs/$UBOOT_CFG $UBOOT_DIR/.config
+	echo "u-boot build fail!"
+	exit 1
+fi
+
+echo "Build atf..."
+make -C "$ATF_DIR" -f makefile "$ATF_CFG" CONFIG_CROSS_COMPILER="${TOOLCHAIN}"
+make -C "$ATF_DIR" -f makefile clean CONFIG_CROSS_COMPILER="${TOOLCHAIN}"
+rm -rf "$ATF_DIR/build"
+make -C "$ATF_DIR" -f makefile all CONFIG_CROSS_COMPILER="${TOOLCHAIN}"
+
+mkdir -p "output"
+if [ -f "$ATF_DIR/build/${SOC}/release/fip.bin" ]; then
+	FIP_NAME="${SOC}_${BOARD}-fip"
 	if [ "$fixedparts" = "1" ]; then
-		echo "Build u-boot with fixed-mtdparts!"
-		echo "CONFIG_MEDIATEK_UBI_FIXED_MTDPARTS=y" >> $UBOOT_DIR/.config
-		echo "CONFIG_MTK_FIXED_MTD_MTDPARTS=y" >> $UBOOT_DIR/.config
+		FIP_NAME="${FIP_NAME}-fixed-parts"
 	fi
-	make -C $UBOOT_DIR olddefconfig
-	make -C $UBOOT_DIR -j $(nproc) all
-	if [ -f "$UBOOT_DIR/u-boot.bin" ]; then
-		cp -f $UBOOT_DIR/u-boot.bin $ATF_DIR/u-boot.bin
-		echo "u-boot build done!"
-	else
-		echo "u-boot build fail!"
-		exit 1
+	if [ "$multilayout" = "1" ]; then
+		FIP_NAME="${FIP_NAME}-multi-layout"
 	fi
-fi
-
-if [ ! -f $ATF_DIR/configs/$ATF_CFG ]; then
-	echo "$ATF_DIR/configs/$ATF_CFG not found!"
-	exit 1
+	cp -f "$ATF_DIR/build/${SOC}/release/fip.bin" "output/${FIP_NAME}.bin"
+	echo "$FIP_NAME build done"
 else
-	echo "Build atf..."
-	make -C $ATF_DIR -f makefile $ATF_CFG CONFIG_CROSS_COMPILER=${TOOLCHAIN}
-	make -C $ATF_DIR -f makefile clean CONFIG_CROSS_COMPILER=${TOOLCHAIN}
-	rm -rf $ATF_DIR/build
-	make -C $ATF_DIR -f makefile all CONFIG_CROSS_COMPILER=${TOOLCHAIN}
-	if [ -f "$ATF_DIR/build/${SOC}/release/fip.bin" ]; then
-		mkdir -p output
-		FIP_NAME="${SOC}_${BOARD}-fip"
-		if [ "$fixedparts" = "1" ]; then
-			FIP_NAME="${FIP_NAME}-fixed-parts"
-		fi
-		if [ "$multilayout" = "1" ]; then
-			FIP_NAME="${FIP_NAME}-multi-layout"
-		fi
-		cp -f $ATF_DIR/build/${SOC}/release/fip.bin output/${FIP_NAME}.bin
-		echo "$FIP_NAME build done"
+	echo "fip build fail!"
+	exit 1
+fi
+if grep -q "CONFIG_TARGET_ALL_NO_SEC_BOOT=y" "$ATF_DIR/configs/$ATF_CFG"; then
+	if [ -f "$ATF_DIR/build/${SOC}/release/bl2.img" ]; then
+		BL2_NAME="${SOC}_${BOARD}-bl2"
+		cp -f "$ATF_DIR/build/${SOC}/release/bl2.img" "output/${BL2_NAME}.bin"
+		echo "$BL2_NAME build done"
 	else
-		echo "fip build fail!"
+		echo "bl2 build fail!"
 		exit 1
 	fi
-	if grep -q "CONFIG_TARGET_ALL_NO_SEC_BOOT=y" $ATF_DIR/configs/$ATF_CFG ; then
-		if [ -f "$ATF_DIR/build/${SOC}/release/bl2.img" ]; then
-			[ ! -d "./output" ] && mkdir -p output
-			BL2_NAME="${SOC}_${BOARD}-bl2"
-			cp -f $ATF_DIR/build/${SOC}/release/bl2.img output/${BL2_NAME}.bin
-			echo "$BL2_NAME build done"
-		else
-			echo "bl2 build fail!"
-			exit 1
-		fi
-	fi
 fi