From 0436a29d64ac791fefc764fadc7e64ba16bb6b25 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Thu, 11 Apr 2019 09:42:58 +0800 Subject: make.sh: use "${RKCHIP_LOADER}MINIALL*.ini" to match ini files clean: use variant "ini" for default MINIALL.ini path Change-Id: Ia1583a915ebbbc4ec5299b9ef6d81b04592bd04b Signed-off-by: Joseph Chen --- make.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make.sh b/make.sh index b2e50ecca6..da072205b9 100755 --- a/make.sh +++ b/make.sh @@ -543,17 +543,17 @@ pack_uboot_image() pack_loader_image() { - local mode=$1 files ini + local mode=$1 files ini=${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini - if [ ! -f ${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini ]; then - echo "pack loader failed! Can't find: ${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini" + if [ ! -f $ini ]; then + echo "pack loader failed! Can't find: $ini" return fi cd ${RKBIN} if [ "${mode}" = 'all' ]; then - files=`ls ${RKBIN}/RKBOOT/${RKCHIP_LOADER}*MINIALL*.ini` + files=`ls ${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL*.ini` for ini in $files do if [ -f "$ini" ]; then @@ -562,8 +562,8 @@ pack_loader_image() fi done else - ${RKTOOLS}/boot_merger ${BIN_PATH_FIXUP} ${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini - echo "pack loader okay! Input: ${RKBIN}/RKBOOT/${RKCHIP_LOADER}MINIALL.ini" + ${RKTOOLS}/boot_merger ${BIN_PATH_FIXUP} $ini + echo "pack loader okay! Input: $ini" fi cd - && mv ${RKBIN}/*_loader_*.bin ./ -- cgit v1.2.3