From 9b34de8b1815ddd926b2ad0de538944bd1aa262c Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Sun, 05 Jun 2022 19:47:26 +0800 Subject: [PATCH] 1, Add linux-imx-lf-5.10.52-2.1.0.patch to support overlays, lcd and camera not test; 2, Update linux kernel build shell script; 3, Update igkboard.json --- bsp/kernel/build.sh | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh index 681d4b5..b3aec4d 100755 --- a/bsp/kernel/build.sh +++ b/bsp/kernel/build.sh @@ -3,12 +3,14 @@ source ../scripts/setup_env.sh +PRJ_PATH=`pwd` + KERNEL_SRC=linux-imx -patch_file=$(eval echo `jq -r ".KERNEL_SRC.PATCH" $JSON_CONF`) -arch=$(eval echo `jq -r ".CONFIG.ARCH" $JSON_CONF`) -defconf=$(eval echo `jq -r ".CONFIG.DEFCONF" $JSON_CONF`) -drvpath=$(eval echo `jq -r ".CONFIG.DRVPATH" $JSON_CONF`) +patch_file=${PRJ_PATH}/patch/linux-imx-${BSP_VER}.patch +arch=arm +defconf=${BOARD}_defconfig +drvpath=${PRJ_PATH}/../images/drivers set -u set -e @@ -21,7 +23,6 @@ fi do_fetch_json $JSON_CONF KERNEL_SRC $KERNEL_SRC - rm -rf *.tar* } function do_patch() @@ -34,7 +35,7 @@ fi pr_warn "Modify cross compiler in Makefile: $CROSS_TOOL" - 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} } @@ -80,12 +81,14 @@ pr_warn "Clean ${KERNEL_SRC} source code" cd ${KERNEL_SRC} - make savedefconfig - mv defconfig arch/arm/configs/$defconf + if [ -f .config ] ; then + make savedefconfig + mv defconfig arch/arm/configs/$defconf + fi make distclean cd - - mv ${KERNEL_SRC} ${KERNEL_SRC}-${BOARD} + mv ${KERNEL_SRC} ${KERNEL_SRC}-${BSP_VER} pr_warn "Fetch orignal source code" do_fetch @@ -93,10 +96,10 @@ pr_warn "Generate ${KERNEL_SRC} patch file" set +e - diff -Nuar -x "include-prefixes" -x logo_linux_clut224.ppm ${KERNEL_SRC} ${KERNEL_SRC}-${BOARD} > $patch_file + diff -Nuar --no-dereference -x logo_linux_clut224.ppm ${KERNEL_SRC} ${KERNEL_SRC}-${BSP_VER} > $patch_file rm -rf ${KERNEL_SRC} - mv ${KERNEL_SRC}-${BOARD} ${KERNEL_SRC} + mv ${KERNEL_SRC}-${BSP_VER} ${KERNEL_SRC} } function do_usage() -- Gitblit v1.9.1