From ac601ba02e5df2a8c4d9f09bf24cf4607b81a1da Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 04 Jun 2022 18:37:50 +0800
Subject: [PATCH] update u-boot patch to add fdt overlay support
---
bsp/bootloader/build.sh | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index ee36c1d..d368d40 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()
@@ -33,7 +35,12 @@
patch -p1 < $patch_file
fi
- pr_warn "Modify cross compiler in Makefile: $CROSS_TOOL\n"
+ 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"
sed -i -e "s|^CROSS_COMPILE=.*|CROSS_COMPILE?=${CROSS_TOOL}|g" Makefile
cd ${PRJ_PATH}
@@ -87,7 +94,7 @@
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 +102,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