From b901880014f1b2099f7390833ed6eebd97c0e50a Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 11 Aug 2019 19:09:24 +0800
Subject: [PATCH] update linux-bsp build shell script and patch file for new buildroot cross compiler

---
 linux-bsp/patches/at91bootstrap-sama5d4.patch |    2 +-
 linux-bsp/patches/linux-at91-sama5d4.patch    |    2 +-
 linux-bsp/patches/u-boot-at91-sama5d4.patch   |    2 +-
 linux-bsp/build.sh                            |   15 +++++++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/linux-bsp/build.sh b/linux-bsp/build.sh
index 774f598..ed8273a 100755
--- a/linux-bsp/build.sh
+++ b/linux-bsp/build.sh
@@ -10,10 +10,13 @@
 
 PROJ_PATH=`pwd`
 
+CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
+
 BOARD=sama5d4
 PACK_PATH=${PROJ_PATH}/tarballs
 PATCH_PATH=${PROJ_PATH}/patches
 PATCH_SUFIX=${BOARD}.patch
+
 
 
 ROOTFS_SRC=rootfs
@@ -85,6 +88,10 @@
 
         if [ -f ${PATCH_PATH}/${SRC_DIR}-${PATCH_SUFIX} ] ; then 
             show_banner "|            patch for ${SRC_DIR}             |"
+
+            # update cross compiler
+            sed -i -e "s|^+CROSSTOOL=.*|+CROSSTOOL=${CROSSTOOL}|g" ${PATCH_PATH}/${SRC_DIR}-${PATCH_SUFIX}
+
             patch -p1 < ${PATCH_PATH}/${SRC_DIR}-${PATCH_SUFIX}
         fi
     else
@@ -152,12 +159,8 @@
 function build_rootfs()
 {
     if [ ! -d ${ROOTFS_SRC} ] ; then 
-        if [ `id -u` != 0 ] ; then 
-            printf "\nERROR: decompress rootfs need root privilege, please use sudo!\n\n" 
-            exit ; 
-        fi 
-
-        tar -xJf ${PACK_PATH}/${ROOTFS_SRC}.tar.xz
+        printf "\nWARNNING: decompress rootfs need root privilege, please input sudo passwd!\n\n" 
+        sudo tar -xJf ${PACK_PATH}/${ROOTFS_SRC}.tar.xz
     fi
 
 	show_banner "|           start build rootfs image...        |"
diff --git a/linux-bsp/patches/at91bootstrap-sama5d4.patch b/linux-bsp/patches/at91bootstrap-sama5d4.patch
index 8dd8cf9..729c735 100644
--- a/linux-bsp/patches/at91bootstrap-sama5d4.patch
+++ b/linux-bsp/patches/at91bootstrap-sama5d4.patch
@@ -9,7 +9,7 @@
 +IMGS_PATH=../images
 +IMG_NAME=bootstrap-${BOARD}.bin
 +
-+CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
++CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
 +JOBS=`cat /proc/cpuinfo |grep "processor"|wc -l`
 +
 +
diff --git a/linux-bsp/patches/linux-at91-sama5d4.patch b/linux-bsp/patches/linux-at91-sama5d4.patch
index 156155a..396a970 100644
--- a/linux-bsp/patches/linux-at91-sama5d4.patch
+++ b/linux-bsp/patches/linux-at91-sama5d4.patch
@@ -11,7 +11,7 @@
 +
 +#INITRAMFS=YES
 +
-+CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
++CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
 +JOBS=`cat /proc/cpuinfo |grep "processor"|wc -l`
 +
 +set -e
diff --git a/linux-bsp/patches/u-boot-at91-sama5d4.patch b/linux-bsp/patches/u-boot-at91-sama5d4.patch
index 0a0c611..b183388 100644
--- a/linux-bsp/patches/u-boot-at91-sama5d4.patch
+++ b/linux-bsp/patches/u-boot-at91-sama5d4.patch
@@ -9,7 +9,7 @@
 +IMGS_PATH=../images
 +IMG_NAME=u-boot-${BOARD}.bin
 +
-+CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
++CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
 +JOBS=`cat /proc/cpuinfo |grep "processor"|wc -l`
 +
 +

--
Gitblit v1.9.1