From bfceb172fbac401c760473a4ee7c159940253d9b Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 26 Nov 2021 21:43:31 +0800
Subject: [PATCH] remove space in the end of a line

---
 bsp/kernel/build.sh |   91 +++++++++++++++++++++++++++++++++------------
 1 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh
index fd549de..34486f0 100755
--- a/bsp/kernel/build.sh
+++ b/bsp/kernel/build.sh
@@ -4,15 +4,15 @@
 
 PRJ_PATH=`pwd`
 
-IMG_PATH=${PRJ_PATH}/../images/bin
-  
+IMG_PATH=${PRJ_PATH}/../images/boot
+
 BOARD=imx6ull
- 
-CROSS_TOOL=arm-linux-gnueabihf-
+
+CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
 
 # linux kernel tarball path and branch
-TAR_PATH=/home/guowenxue/imx6ull/bsp/tarball
-BSP_BRANCH=lf-5.10.52-2.1.0 
+TAR_PATH=${PRJ_PATH}/../tarball
+BSP_BRANCH=lf-5.10.52-2.1.0
 
 BOOT=emmc
 
@@ -30,12 +30,12 @@
 STAGE=0
 
 function msg_banner()
-{ 
+{
 	STAGE=`expr $STAGE + 1`
 	
     echo ""
-    echo "+---------------------------------------------+" 
-    printf " Stage $STAGE: $1\n" 
+    echo "+---------------------------------------------+"
+    printf " Stage $STAGE: $1\n"
     echo "+---------------------------------------------+"
     echo ""
 }
@@ -43,7 +43,7 @@
 function do_fetch()
 {
     msg_banner "Fetch ${LINUX_SRC} source code"
-    if [ -d ${LINUX_SRC} ] ; then 
+    if [ -d ${LINUX_SRC} ] ; then
         printf "\n\n -- ${LINUX_SRC} fetched already -- \n\n"
         return 0;
     fi
@@ -67,14 +67,14 @@
 
     cd ${PRJ_PATH}
 }
-  
+
 function do_build()
 {
     msg_banner "Build for ${LINUX_SRC} source code"
 
     cd ${LINUX_SRC}
 
-    if [ ! -f .config ] ; then 
+    if [ ! -f .config ] ; then
         cp $CONF_FILE .config
     fi
 
@@ -93,8 +93,13 @@
 
     mkdir -p ${IMG_PATH}
 
-    cp arch/arm/boot/Image ${IMG_PATH}
+    set -x
+    cp arch/arm/boot/zImage ${IMG_PATH}
     cp arch/arm/boot/dts/imx6ul-14x14-evk-emmc.dtb ${IMG_PATH}/${BOARD}-${BOOT}.dtb
+
+    cp arch/arm/boot/zImage /tftp
+    cp arch/arm/boot/dts/imx6ul-14x14-evk-emmc.dtb /tftp/${BOARD}-${BOOT}.dtb
+    set +x
 
     if [ $INST_DRIVER != 0 ]  ;then
         make modules_install INSTALL_MOD_PATH=${PRJ_PATH}/../rootfs INSTALL_MOD_STRIP=1
@@ -109,39 +114,75 @@
 
     cd ${LINUX_SRC}
 
-    cp .config $CONF_FILE
+    if [ -f .config ] ; then
+        cp .config $CONF_FILE
+    fi
+
     make distclean
 
     cd ${PRJ_PATH}
 }
 
 function gen_patch()
-{ 
+{
     do_clean
 
-    mv ${LINUX_SRC} ${LINUX_SRC}-${BOARD} 
+    mv ${LINUX_SRC} ${LINUX_SRC}-${BOARD}
 
     do_fetch
 
     msg_banner "Generate ${LINUX_SRC} patch file"
 
     set +e
-    diff -Nuar ${LINUX_SRC} ${LINUX_SRC}-${BOARD} > ${LINUX_SRC}-${BOARD}.patch
+    diff -Nuar -x "include-prefixes" -x logo_linux_clut224.ppm ${LINUX_SRC} ${LINUX_SRC}-${BOARD} > ${LINUX_SRC}-${BOARD}.patch
 
     rm -rf ${LINUX_SRC}
     mv ${LINUX_SRC}-${BOARD} ${LINUX_SRC}
 }
 
-if [[ $# == 1 ]] && [[ $1 == "patch" ]] ; then
-    gen_patch
-    exit 0;
-fi
+function do_usage()
+{
+    echo ""
+    echo "Usage:"
+    echo "  $0 [-b] [p] [-c] [-h]"
+    echo "     -b: download and build $PRJ_NAME"
+    echo "     -p: generate $PRJ_NAME patch file"
+    echo "     -c: clean the source code"
+    echo "     -h: show this help message"
+    echo ""
+    exit;
+}
+
+while getopts "bpch" OPTNAME
+do
+    case "${OPTNAME}" in
+        "b")
+            break;
+            ;;
+
+        "p")
+            gen_patch
+            exit;
+            ;;
+
+        "c")
+            do_clean
+            exit;
+            ;;
+
+        "*")
+            do_usage
+            exit;
+            ;;
+    esac
+done
+
+# Default do build action
 
 do_fetch
-
 do_patch
-
 do_build
-
 do_install
-  
+
+exit;
+

--
Gitblit v1.9.1