From 6a4b3a1935c6d9a2f48ea0e1e82c7046b4efd85a Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 22 Dec 2021 20:04:05 +0800
Subject: [PATCH] update linux patch to add igkboard-emmc.dts

---
 bsp/kernel/build.sh |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh
index cc41d88..b786ad4 100755
--- a/bsp/kernel/build.sh
+++ b/bsp/kernel/build.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-INST_DRIVER=0
+INST_DRIVER=1
 
 PRJ_PATH=`pwd`
 
 IMG_PATH=${PRJ_PATH}/../images/boot
 
-BOARD=imx6ull
+BOARD=igkboard
 
 CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
 
@@ -20,7 +20,7 @@
 
 PATCH_FILE=${PRJ_PATH}/patch/${LINUX_SRC}-${BOARD}.patch
 
-CONF_FILE=.cfg-${BOARD}
+CONF_FILE=arch/arm/configs/${BOARD}_defconfig
 
 JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
 
@@ -63,7 +63,7 @@
     fi
 
     printf "\n\nModify cross compiler in Makefile: $CROSS_TOOL\n\n"
-    sed -i -e "s|^CROSS_COMPILE=.*|CROSS_COMPILE=${CROSS_TOOL}|g" Makefile
+    sed -i -e "s|^CROSS_COMPILE=.*|CROSS_COMPILE?=${CROSS_TOOL}|g" Makefile
 
     cd ${PRJ_PATH}
 }
@@ -74,10 +74,7 @@
 
     cd ${LINUX_SRC}
 
-    if [ ! -f .config ] ; then
-        cp $CONF_FILE .config
-    fi
-
+    make ${BOARD}_defconfig
     make -j ${JOBS}
 
     cd ${PRJ_PATH}
@@ -94,14 +91,15 @@
 
     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/dts/${BOARD}-${BOOT}.dtb ${IMG_PATH}/
 
     cp arch/arm/boot/zImage /tftp
-    cp arch/arm/boot/dts/imx6ul-14x14-evk-emmc.dtb /tftp/${BOARD}-${BOOT}.dtb
+    cp arch/arm/boot/dts/${BOARD}-${BOOT}.dtb /tftp/
     set +x
 
     if [ $INST_DRIVER != 0 ]  ;then
-        make modules_install INSTALL_MOD_PATH=${PRJ_PATH}/../rootfs INSTALL_MOD_STRIP=1
+        rm -rf ${PRJ_PATH}/../rootfs/driver
+        make modules_install INSTALL_MOD_PATH=${PRJ_PATH}/../rootfs/driver INSTALL_MOD_STRIP=1
     fi
 
     cd ${PRJ_PATH}
@@ -113,10 +111,6 @@
 
     cd ${LINUX_SRC}
 
-    if [ -f .config ] ; then
-        cp .config $CONF_FILE
-    fi
-
     make distclean
 
     cd ${PRJ_PATH}
@@ -124,7 +118,12 @@
 
 function gen_patch()
 {
-    do_clean
+    msg_banner "Clean ${LINUX_SRC} source code"
+    cd ${LINUX_SRC}
+    make savedefconfig
+    mv defconfig ${CONF_FILE}
+    make distclean
+    cd -
 
     mv ${LINUX_SRC} ${LINUX_SRC}-${BOARD}
 
@@ -133,6 +132,7 @@
     msg_banner "Generate ${LINUX_SRC} patch file"
 
     set +e
+
     diff -Nuar -x "include-prefixes" -x logo_linux_clut224.ppm ${LINUX_SRC} ${LINUX_SRC}-${BOARD} > ${LINUX_SRC}-${BOARD}.patch
 
     rm -rf ${LINUX_SRC}

--
Gitblit v1.9.1