qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make.sh: update tpl pack command 

All available:
	./make.sh tpl-spl    --- pack tpl+spl
	./make.sh tpl        --- pack tpl
	./make.sh spl-s      --- pack spl
	./make.sh spl        --- pack spl

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iea58976bb7fc87775b8c3c1bd2c1fd151c6be51c
This commit is contained in:
Joseph Chen 2020-06-22 20:38:05 +08:00
parent 8885b307bc
commit 00dada44a9
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
make.sh
View File

@ -54,6 +54,11 @@ CHIP_CFG_FIXUP_TABLE=(
"CONFIG_ROCKCHIP_RV1126 3 - -,- -,- -,- -,- - -" "CONFIG_ROCKCHIP_RV1126 3 - -,- -,- -,- -,- - -"
) )
CHIP_TPL_MAGIC_TABLE=(
"CONFIG_ROCKCHIP_PX30 RK33"
"CONFIG_ROCKCHIP_RV1126 110B"
)
########################################### User can modify ############################################# ########################################### User can modify #############################################
# User's rkbin tool relative path # User's rkbin tool relative path
RKBIN_TOOLS=../rkbin/tools RKBIN_TOOLS=../rkbin/tools
@ -598,20 +603,44 @@ function pack_spl_loader_image()
return return
fi fi
# Find magic for TPL
for item in "${CHIP_TPL_MAGIC_TABLE[@]}"
do
config_xxx=`echo ${item} | awk '{ print $1 }'`
if grep -q "^${config_xxx}=y" .config ; then
header=`echo ${item} | awk '{ print $2 }'`
fi
done
if [ -z ${header} ]; then
header=`sed -n '/NAME=/s/NAME=//p' ${ini}`
fi
# Prepare files
rm ${tmpdir} -rf && mkdir ${tmpdir} -p rm ${tmpdir} -rf && mkdir ${tmpdir} -p
cp spl/u-boot-spl.bin ${tmpdir}/ && cp ${ini} ${tmpini} cp spl/u-boot-spl.bin ${tmpdir}/ && cp ${ini} ${tmpini}
if [ "${mode}" == "tpl-spl" ]; then # pack tpl+spl if [ "${mode}" == "tpl-spl" ]; then # pack tpl+spl
label="TPL+SPL" label="TPL+SPL"
cp tpl/u-boot-tpl.bin ${tmpdir}/ cp tpl/u-boot-tpl.bin ${tmpdir}/
header=`sed -n '/NAME=/s/NAME=//p' ${ini}`
dd if=${tmpdir}/u-boot-tpl.bin of=${tmpdir}/tpl.bin bs=1 skip=4 dd if=${tmpdir}/u-boot-tpl.bin of=${tmpdir}/tpl.bin bs=1 skip=4
sed -i "1s/^/${header:0:4}/" ${tmpdir}/tpl.bin sed -i "1s/^/${header:0:4}/" ${tmpdir}/tpl.bin
sed -i "s/FlashData=.*$/FlashData=.\/tmp\/tpl.bin/" ${tmpini} sed -i "s/FlashData=.*$/FlashData=.\/tmp\/tpl.bin/" ${tmpini}
sed -i "0,/Path1=.*/s/Path1=.*$/Path1=.\/tmp\/tpl.bin/" ${tmpini}
sed -i "s/FlashBoot=.*$/FlashBoot=.\/tmp\/u-boot-spl.bin/" ${tmpini}
elif [ "${mode}" == "tpl" ]; then # pack tpl
label="TPL"
cp tpl/u-boot-tpl.bin ${tmpdir}/
dd if=${tmpdir}/u-boot-tpl.bin of=${tmpdir}/tpl.bin bs=1 skip=4
sed -i "1s/^/${header:0:4}/" ${tmpdir}/tpl.bin
sed -i "s/FlashData=.*$/FlashData=.\/tmp\/tpl.bin/" ${tmpini}
sed -i "0,/Path1=.*/s/Path1=.*$/Path1=.\/tmp\/tpl.bin/" ${tmpini}
else else
label="SPL" label="SPL"
sed -i "s/FlashBoot=.*$/FlashBoot=.\/tmp\/u-boot-spl.bin/" ${tmpini}
fi fi
sed -i "s/FlashBoot=.*$/FlashBoot=.\/tmp\/u-boot-spl.bin/" ${tmpini}
# Pack
cd ${RKBIN} cd ${RKBIN}
${RKTOOLS}/boot_merger ${tmpini} ${RKTOOLS}/boot_merger ${tmpini}