diff options
| author | Joseph Chen <chenjh@rock-chips.com> | 2019-04-11 09:42:58 +0800 |
|---|---|---|
| committer | Jianhong Chen <chenjh@rock-chips.com> | 2019-04-11 15:35:00 +0800 |
| commit | 0436a29d64ac791fefc764fadc7e64ba16bb6b25 (patch) | |
| tree | dfb11d09c9de986358d8de11d390126100e05d80 | |
| parent | f089d907dee8c0ceb2394ba1cdca43cc3cd8d90d (diff) | |
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 <chenjh@rock-chips.com>
| -rwxr-xr-x | make.sh | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 ./ |