From 33a463842a83f5611e17092f52a607dde2938e4f Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 22 Dec 2023 10:12:38 +0800
Subject: [PATCH] Update bootloader build shell script to do patch

---
 bootloader/build.sh |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bootloader/build.sh b/bootloader/build.sh
index 0e90a1f..43e7c71 100755
--- a/bootloader/build.sh
+++ b/bootloader/build.sh
@@ -69,8 +69,8 @@
 
         ATF_PLATFORM=imx8mp
         IMX_BOOT_SOC_TARGET=iMX8MP
-        IMXBOOT_TARGETS=flash_ddr4_evk
-        IMXBOOT_DTB=imx8mp-ddr4-evk.dtb
+        IMXBOOT_TARGETS=flash_evk
+        IMXBOOT_DTB=imx8mp-evk.dtb
         MKIMG_BIN_PATH=$PRJ_PATH/imx-mkimage/iMX8M/
 
     elif [[ $BOARD =~ mx8mm ]] ; then
@@ -99,14 +99,13 @@
         git clone $GIT_URL/$src.git -b $BRANCH --depth=1
 
         # do patch if patch file exist
-        PATCH_FILE=$PRJ_PATH/patches/$BOARD/$src-$BSP_VER.patch
-        if [ -s $PATCH_FILE ] ; then
+        patch_file=$PRJ_PATH/patches/$BOARD/$src-$BSP_VER.patch
+        if [ -s $patch_file ] ; then
             pr_warn "do patch for $src now..."
             cd $src
-            patch -p1 < $PATCH_FILE
+            patch -p1 < $patch_file
             cd -
         fi
-
     done
 
 
@@ -178,14 +177,21 @@
 function build_uboot()
 {
     SRC=uboot-imx
+    patch_file=$PRJ_PATH/patches/$BOARD/$SRC-$BSP_VER.patch
+    defconfig=${BOARD}_defconfig
 
     pr_warn "start build $SRC"
     cd $PRJ_PATH/${SRC}
 
+    # do patch if not patched
+    if [ ! -s configs/$defconfig ] ; then
+        pr_warn "do patch for $SRC now..."
+        patch -p1 < $patch_file
+    fi
+
     if [ ! -f .config ] ; then
         make ARCH=arm ${BOARD}_defconfig
     fi
-
     make -j${JOBS} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm
 
     set -x
@@ -247,13 +253,11 @@
         pr_info "Copy DDR4 firmware to $MKIMG_BIN_PATH"
 
         cp $FMW_PATH/firmware-imx-*/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $MKIMG_BIN_PATH
-        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/ddr4_imem_1d*.bin $MKIMG_BIN_PATH
-        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/ddr4_dmem_1d*.bin $MKIMG_BIN_PATH
-        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/ddr4_imem_2d*.bin $MKIMG_BIN_PATH
-        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/ddr4_dmem_2d*.bin $MKIMG_BIN_PATH
+        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/lpddr4_pmu_train_[1-2]d_imem_202006.bin $MKIMG_BIN_PATH
+        cp $FMW_PATH/firmware-imx-*/firmware/ddr/synopsys/lpddr4_pmu_train_[1-2]d_dmem_202006.bin $MKIMG_BIN_PATH
     fi
 
-    make SOC=$IMX_BOOT_SOC_TARGET REV=A2 $IMXBOOT_TARGETS
+    make SOC=$IMX_BOOT_SOC_TARGET $IMXBOOT_TARGETS
 
     cp $MKIMG_BIN_PATH/flash.bin u-boot-${BOARD}.imx
     chmod a+x u-boot-${BOARD}.imx
@@ -283,6 +287,7 @@
     if [[ -n "$INST_PATH" && -w $INST_PATH ]] ; then
         pr_info "install bootloader to '$INST_PATH'"
         cp $PRFX_PATH/u-boot-${BOARD}.imx $INST_PATH
+        #sz $PRFX_PATH/u-boot-${BOARD}.imx
     fi
 }
 

--
Gitblit v1.9.1