make.sh: support pack all loaders

Command:
	./make.sh loader-all

Change-Id: I458c30f6505eaace52858254277905e163255fa2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-07-10 15:18:43 +08:00 committed by Jianhong Chen
parent b8654f90c4
commit 5c75ab41e7
1 changed files with 22 additions and 16 deletions

38
make.sh
View File

@ -84,7 +84,7 @@ prepare()
else else
case $BOARD in case $BOARD in
# Parse from exit .config # Parse from exit .config
''|elf*|trust|loader|uboot|map|sym) ''|elf*|loader*|trust|uboot|map|sym)
count=`find -name .config | wc -l` count=`find -name .config | wc -l`
dir=`find -name .config` dir=`find -name .config`
# Good, find only one .config # Good, find only one .config
@ -124,7 +124,7 @@ prepare()
;; ;;
#Subcmd #Subcmd
''|elf*|trust|loader|uboot|map|sym) ''|elf*|loader*|trust|uboot|map|sym)
;; ;;
*) *)
@ -194,7 +194,7 @@ select_toolchain()
sub_commands() sub_commands()
{ {
local cmd=${SUBCMD%-*} elfopt=${SUBCMD#*-} local cmd=${SUBCMD%-*} opt=${SUBCMD#*-}
case $cmd in case $cmd in
elf) elf)
@ -203,10 +203,10 @@ sub_commands()
exit 1 exit 1
else else
# default 'cmd' without option, use '-D' # default 'cmd' without option, use '-D'
if [ "${cmd}" = 'elf' -a "${elfopt}" = 'elf' ]; then if [ "${cmd}" = 'elf' -a "${opt}" = 'elf' ]; then
elfopt=D opt=D
fi fi
${TOOLCHAIN_OBJDUMP} -${elfopt} ${OUTDIR}/u-boot | less ${TOOLCHAIN_OBJDUMP} -${opt} ${OUTDIR}/u-boot | less
exit 0 exit 0
fi fi
;; ;;
@ -227,7 +227,7 @@ sub_commands()
;; ;;
loader) loader)
pack_loader_image pack_loader_image ${opt}
exit 0 exit 0
;; ;;
@ -330,7 +330,7 @@ pack_uboot_image()
pack_loader_image() pack_loader_image()
{ {
local files ini local mode=$1 files ini
if [ ! -f ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini ]; then if [ ! -f ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini ]; then
echo "pack loader failed! Can't find: ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini" echo "pack loader failed! Can't find: ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini"
@ -338,14 +338,20 @@ pack_loader_image()
fi fi
cd ${RKBIN} cd ${RKBIN}
files=`ls ${RKBIN}/RKBOOT/${RKCHIP}MINIALL*.ini`
for ini in $files if [ "${mode}" = 'all' ]; then
do files=`ls ${RKBIN}/RKBOOT/${RKCHIP}MINIALL*.ini`
if [ -f "$ini" ]; then for ini in $files
${RKTOOLS}/boot_merger --replace tools/rk_tools/ ./ $ini do
echo "pack loader okay! Input: $ini" if [ -f "$ini" ]; then
fi ${RKTOOLS}/boot_merger --replace tools/rk_tools/ ./ $ini
done echo "pack loader okay! Input: $ini"
fi
done
else
${RKTOOLS}/boot_merger --replace tools/rk_tools/ ./ ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini
echo "pack loader okay! Input: ${RKBIN}/RKBOOT/${RKCHIP}MINIALL.ini"
fi
cd - && mv ${RKBIN}/*_loader_*.bin ./ cd - && mv ${RKBIN}/*_loader_*.bin ./
} }