fip: uboot 2025 bringup [3/3]
PD#SWPL-194143
Problem:
uboot 2025 bringup
Solution:
refine scripts to build 2025 version
Verify:
local
Change-Id: Ibc6172af43fa10a88dffdec48bf274fff502a4e2
Signed-off-by: Bo Lv <bo.lv@amlogic.com>
diff --git a/build_bl33.sh b/build_bl33.sh
index 38aef2f..fe3bedd 100755
--- a/build_bl33.sh
+++ b/build_bl33.sh
@@ -5,7 +5,7 @@
cd ${MAIN_FOLDER}
- for file in `ls -d ${BL33_DEFCFG1}/* ${BL33_DEFCFG2}/* ${BL33_DEFCFG3}/*`; do
+ for file in `ls -d ${BL33_DEFCFG1}/* ${BL33_DEFCFG2}/* ${BL33_DEFCFG3}/* ${BL33_DEFCFG4}/*`; do
temp_file=`basename $file`
#echo $temp_file
temp_file=${temp_file%_*}
@@ -17,6 +17,8 @@
bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION2}
elif [ "2023" == "${CONFIG_BUILD_VERSION}" ]; then
bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION3}
+ elif [ "2025" == "${CONFIG_BUILD_VERSION}" ]; then
+ bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION4}
else
echo "input parameter error"
exit 1
@@ -28,6 +30,8 @@
bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION2}
elif [ "${BL33_DEFCFG3}" == "$(dirname $file)" ]; then
bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION3}
+ elif [ "${BL33_DEFCFG4}" == "$(dirname $file)" ]; then
+ bl33_path=${UBOOT_FOLDER}/${UBOOT_VERSION4}
else
echo "not found defconfig"
exit 1
@@ -165,7 +169,7 @@
function uboot_config_list() {
echo " ******Amlogic Configs******"
- for file in `ls -d ${BL33_DEFCFG1}/* ${BL33_DEFCFG2}/* ${BL33_DEFCFG3}/*`; do
+ for file in `ls -d ${BL33_DEFCFG1}/* ${BL33_DEFCFG2}/* ${BL33_DEFCFG3}/* ${BL33_DEFCFG4}/*`; do
temp_file=`basename $file`
#echo "$temp_file"
temp_file=${temp_file%_*}
diff --git a/mk_script.sh b/mk_script.sh
index eaff2aa..0678cb9 100755
--- a/mk_script.sh
+++ b/mk_script.sh
@@ -265,6 +265,13 @@
cd ${BL33_PATH3}
make distclean
fi
+
+ if [ -e ${BL33_PATH4} ]; then
+ cd ${MAIN_FOLDER}
+ cd ${BL33_PATH4}
+ make distclean
+ fi
+
cd ${MAIN_FOLDER}
rm ${FIP_BUILD_FOLDER} -rf
rm ${BUILD_FOLDER}/* -rf
diff --git a/variables.sh b/variables.sh
index 89360ec..c94a21b 100755
--- a/variables.sh
+++ b/variables.sh
@@ -6,7 +6,8 @@
declare UBOOT_VERSION1="v2015"
declare UBOOT_VERSION2="v2019"
declare UBOOT_VERSION3="v2023"
-export UBOOT_VERSION1 UBOOT_VERSION2 UBOOT_VERSION3
+declare UBOOT_VERSION4="v2025"
+export UBOOT_VERSION1 UBOOT_VERSION2 UBOOT_VERSION3 UBOOT_VERSION4
# build environment
BUILD_FOLDER="build/"
@@ -35,10 +36,12 @@
declare BL33_PATH1="bl33/v2015"
declare BL33_PATH2="bl33/v2019"
declare BL33_PATH3="bl33/v2023"
+declare BL33_PATH4="bl33/v2025"
declare BL33_DEFCFG1="${UBOOT_FOLDER}/${UBOOT_VERSION1}/${DEFCFG_FOLDER}"
declare BL33_DEFCFG2="${UBOOT_FOLDER}/${UBOOT_VERSION2}/${DEFCFG_FOLDER}"
declare BL33_DEFCFG3="${UBOOT_FOLDER}/${UBOOT_VERSION3}/${DEFCFG_FOLDER3}"
+declare BL33_DEFCFG4="${UBOOT_FOLDER}/${UBOOT_VERSION4}/${DEFCFG_FOLDER3}"
declare FIP_DDR_PARSE="${FIP_FOLDER}/tools/ddr_parse/"
# current branch/path/rev/name/remote in xml