From 88700c0fc909f6051241232a0bd7277781619d53 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 30 Dec 2021 15:13:46 +0800
Subject: [PATCH] update buildroot to fix debian sudo bug

---
 bsp/bootloader/build.sh |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index 450ee70..51dd684 100755
--- a/bsp/bootloader/build.sh
+++ b/bsp/bootloader/build.sh
@@ -3,26 +3,19 @@
 PRJ_PATH=`pwd`
 PRJ_NAME=`basename ${PRJ_PATH}`
 
-IMG_PATH=${PRJ_PATH}/../images/
-  
-BOARD=imx6ull
- 
+# update by top build.sh
+BOARD=igkboard
+BSP_BRANCH=lf-5.10.52-2.1.0
 CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
 
-# bootloader tarball path and branch
 TAR_PATH=${PRJ_PATH}/../tarball
-BSP_BRANCH=lf-5.10.52-2.1.0
-
-
-BOOT=emmc
+IMG_PATH=${PRJ_PATH}/../images/
 
 UBOOT_SRC=uboot-imx
-
-IMG_NAME=u-boot-${BOARD}-${BOOT}.imx
+IMG_NAME=u-boot-${BOARD}.imx
 
 PATCH_FILE=${PRJ_PATH}/patch/${UBOOT_SRC}-${BOARD}.patch
-
-CONF_FILE=.cfg-${BOARD}
+CONF_FILE=configs/${BOARD}_defconfig
 
 JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
 
@@ -32,12 +25,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 ""
 }
@@ -45,7 +38,7 @@
 function do_fetch()
 {
     msg_banner "Fetch ${UBOOT_SRC} source code"
-    if [ -d ${UBOOT_SRC} ] ; then 
+    if [ -d ${UBOOT_SRC} ] ; then
         printf "\n\n -- ${UBOOT_SRC} fetched already -- \n\n"
         return 0;
     fi
@@ -65,21 +58,18 @@
     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}
 }
-  
+
 function do_build()
 {
     msg_banner "Build for ${UBOOT_SRC} source code"
 
     cd ${UBOOT_SRC}
 
-    if [ ! -f .config ] ; then 
-        cp $CONF_FILE .config
-    fi
-
+    make ${BOARD}_defconfig
     make -j ${JOBS}
     cp u-boot-dtb.imx ${IMG_NAME}
     chmod a+x ${IMG_NAME}
@@ -107,17 +97,21 @@
 
     cd ${UBOOT_SRC}
 
-    cp .config $CONF_FILE
     make distclean
 
     cd ${PRJ_PATH}
 }
 
 function gen_patch()
-{ 
-    do_clean
+{
+    msg_banner "Clean ${UBOOT_SRC} source code"
+    cd ${UBOOT_SRC}
+    make savedefconfig
+    mv defconfig ${CONF_FILE}
+    make distclean
+    cd -
 
-    mv ${UBOOT_SRC} ${UBOOT_SRC}-${BOARD} 
+    mv ${UBOOT_SRC} ${UBOOT_SRC}-${BOARD}
 
     do_fetch
 

--
Gitblit v1.9.1