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

make.sh: support assign ini file for packing loader/trust/spl-s 

Example:
	./make.sh loader ~/rkbin/RKBOOT/RK3399MINIALL_SPINOR.ini
	./make.sh loader ~/rkbin/RKTRUST/RK3308AARCH32TRUST.ini
	./make.sh spl-s ~/rkbin/RKBOOT/RK3399MINIALL_SPINOR.ini

Change-Id: Ie373857befdf030a1b816de629dd38d6be1fc920
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-06-18 17:39:34 +08:00 committed by Jianhong Chen
parent f1892190de
commit dd590c9364
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
make.sh
View File

@ -9,6 +9,7 @@ set -e
BOARD=$1 BOARD=$1
SUBCMD=$1 SUBCMD=$1
FUNCADDR=$1 FUNCADDR=$1
FILE=$2
JOB=`sed -n "N;/processor/p" /proc/cpuinfo|wc -l` JOB=`sed -n "N;/processor/p" /proc/cpuinfo|wc -l`
SUPPORT_LIST=`ls configs/*[r,p][x,v,k][0-9][0-9]*_defconfig` SUPPORT_LIST=`ls configs/*[r,p][x,v,k][0-9][0-9]*_defconfig`
@ -578,6 +579,10 @@ pack_spl_loader_image()
local ini=${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini local ini=${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini
local temp_ini=${RKBIN}/.temp/${RKCHIP_LOADER}MINIALL.ini local temp_ini=${RKBIN}/.temp/${RKCHIP_LOADER}MINIALL.ini
if [ "$FILE" != "" ]; then
ini=$FILE;
fi
if [ ! -f ${ini} ]; then if [ ! -f ${ini} ]; then
echo "pack TPL+SPL loader failed! Can't find: ${ini}" echo "pack TPL+SPL loader failed! Can't find: ${ini}"
return return
@ -591,7 +596,7 @@ pack_spl_loader_image()
fi fi
cp ${OUTDIR}/spl/u-boot-spl.bin ${RKBIN}/.temp/ cp ${OUTDIR}/spl/u-boot-spl.bin ${RKBIN}/.temp/
cp ${OUTDIR}/tpl/u-boot-tpl.bin ${RKBIN}/.temp/ cp ${OUTDIR}/tpl/u-boot-tpl.bin ${RKBIN}/.temp/
cp ${ini} ${RKBIN}/.temp/ cp ${ini} ${RKBIN}/.temp/${RKCHIP_LOADER}MINIALL.ini -f
cd ${RKBIN} cd ${RKBIN}
if [ "$mode" = 'spl' ]; then # pack tpl+spl if [ "$mode" = 'spl' ]; then # pack tpl+spl
@ -618,6 +623,10 @@ pack_loader_image()
{ {
local mode=$1 files ini=${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini local mode=$1 files ini=${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini
if [ "$FILE" != "" ]; then
ini=$FILE;
fi
if [ ! -f $ini ]; then if [ ! -f $ini ]; then
echo "pack loader failed! Can't find: $ini" echo "pack loader failed! Can't find: $ini"
return return
@ -716,6 +725,10 @@ pack_trust_image()
# ARM64 uses trust_merger # ARM64 uses trust_merger
if grep -Eq ''^CONFIG_ARM64=y'|'^CONFIG_ARM64_BOOT_AARCH32=y'' ${OUTDIR}/.config ; then if grep -Eq ''^CONFIG_ARM64=y'|'^CONFIG_ARM64_BOOT_AARCH32=y'' ${OUTDIR}/.config ; then
ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST.ini ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST.ini
if [ "$FILE" != "" ]; then
ini=$FILE;
fi
if [ "${mode}" = 'all' ]; then if [ "${mode}" = 'all' ]; then
files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST*.ini` files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST*.ini`
for ini in $files for ini in $files
@ -728,6 +741,9 @@ pack_trust_image()
# ARM uses loaderimage # ARM uses loaderimage
else else
ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TOS.ini ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TOS.ini
if [ "$FILE" != "" ]; then
ini=$FILE;
fi
if [ "${mode}" = 'all' ]; then if [ "${mode}" = 'all' ]; then
files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}TOS*.ini` files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}TOS*.ini`
for ini in $files for ini in $files