From b0b21f04ce875cb3df23882018f9a6e6a4cb0dca Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 30 Jun 2022 20:36:39 +0800
Subject: [PATCH] update bootloader build shell script for generate patch
---
bsp/bootloader/build.sh | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index 15afe14..0c5bfed 100755
--- a/bsp/bootloader/build.sh
+++ b/bsp/bootloader/build.sh
@@ -3,12 +3,15 @@
source ../scripts/setup_env.sh
+PRJ_PATH=`pwd`
+
UBOOT_SRC=uboot-imx
IMG_NAME=u-boot-${BOARD}.imx
-patch_file=$(eval echo `jq -r ".UBOOT_SRC.PATCH" $JSON_CONF`)
-arch=$(eval echo `jq -r ".CONFIG.ARCH" $JSON_CONF`)
-defconf=$(eval echo `jq -r ".CONFIG.DEFCONF" $JSON_CONF`)
+arch=arm
+defconf=${BOARD}_defconfig
+patch_file=${PRJ_PATH}/patch/uboot-imx-${BSP_VER}.patch
+logo_file=${PRJ_PATH}/patch/logo_uboot_364x128.bmp
set -u
set -e
@@ -21,7 +24,6 @@
fi
do_fetch_json $JSON_CONF UBOOT_SRC $UBOOT_SRC
- rm -rf *.tar*
}
function do_patch()
@@ -31,6 +33,11 @@
if [ ! -s configs/$defconf -a -s $patch_file ] ; then
pr_warn "Patch for ${UBOOT_SRC} source code"
patch -p1 < $patch_file
+ fi
+
+ pr_warn "Copy logo file: `basename $logo_file` "
+ if [ ! -s tools/logos/lingyun.bmp ] ; then
+ cp $logo_file tools/logos/lingyun.bmp
fi
pr_warn "Modify cross compiler in Makefile: $CROSS_TOOL"
@@ -82,12 +89,14 @@
pr_warn "Clean ${UBOOT_SRC} source code"
cd ${UBOOT_SRC}
- make savedefconfig
- mv defconfig configs/$defconf
+ if [ -f .config ] ; then
+ make savedefconfig
+ mv defconfig configs/$defconf
+ fi
make distclean
cd -
- mv ${UBOOT_SRC} ${UBOOT_SRC}-${BOARD}
+ mv ${UBOOT_SRC} ${UBOOT_SRC}-${BSP_VER}
pr_warn "Fetch orignal source code"
do_fetch
@@ -95,10 +104,10 @@
pr_warn "Generate ${UBOOT_SRC} patch file"
set +e
- diff -Nuar ${UBOOT_SRC} ${UBOOT_SRC}-${BOARD} > $patch_file
+ diff -Nuar -x lingyun.bmp ${UBOOT_SRC} ${UBOOT_SRC}-${BSP_VER} > $patch_file
rm -rf ${UBOOT_SRC}
- mv ${UBOOT_SRC}-${BOARD} ${UBOOT_SRC}
+ mv ${UBOOT_SRC}-${BSP_VER} ${UBOOT_SRC}
}
function do_usage()
--
Gitblit v1.9.1