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

make.sh: simplify remove file 

rm -rf can always return 0.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1f7e14ec860bb0da7b72132a8945a959b20cd440
This commit is contained in:
Joseph Chen 2020-04-20 19:37:19 +08:00
parent f9afd3dc76
commit a11e2c8225
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
make.sh
View File

@ -496,7 +496,7 @@ function pack_uboot_image()
exit 1 exit 1
fi fi
${RKTOOLS}/loaderimage --pack --uboot u-boot.bin uboot.img ${uboot_load_addr} ${PLATFORM_UBOOT_IMG_SIZE} ${RKTOOLS}/loaderimage --pack --uboot u-boot.bin uboot.img ${uboot_load_addr} ${PLATFORM_UBOOT_IMG_SIZE}
ls u-boot.img u-boot-dtb.img >/dev/null 2>&1 && rm u-boot.img u-boot-dtb.img -rf rm u-boot.img u-boot-dtb.img -rf
echo "pack uboot okay! Input: u-boot.bin" echo "pack uboot okay! Input: u-boot.bin"
} }
@ -569,7 +569,7 @@ function pack_spl_loader_image()
return return
fi fi
ls ${tmp_dir} >/dev/null 2>&1 && rm ${tmp_dir} -rf rm ${tmp_dir} -rf
mkdir ${tmp_dir} -p mkdir ${tmp_dir} -p
cp spl/u-boot-spl.bin ${tmp_dir}/ cp spl/u-boot-spl.bin ${tmp_dir}/
cp $ini $tmp_ini cp $ini $tmp_ini
@ -589,7 +589,7 @@ function pack_spl_loader_image()
${RKTOOLS}/boot_merger $tmp_ini ${RKTOOLS}/boot_merger $tmp_ini
rm ${tmp_dir} -rf rm ${tmp_dir} -rf
cd - cd -
ls *_loader_*.bin >/dev/null 2>&1 && rm *_loader_*.bin rm *_loader_*.bin -rf
mv ${RKBIN}/*_loader_*.bin ./ mv ${RKBIN}/*_loader_*.bin ./
filename=`basename *_loader_*.bin` filename=`basename *_loader_*.bin`
@ -616,8 +616,7 @@ function pack_loader_image()
return return
fi fi
ls *_loader_*.bin >/dev/null 2>&1 && rm *_loader_*.bin rm *_loader_*.bin -rf
numline=`cat $ini | wc -l` numline=`cat $ini | wc -l`
if [ $numline -eq 1 ]; then if [ $numline -eq 1 ]; then
image=`sed -n "/PATH=/p" $ini | tr -d '\r' | cut -d '=' -f 2` image=`sed -n "/PATH=/p" $ini | tr -d '\r' | cut -d '=' -f 2`
@ -677,7 +676,7 @@ function pack_trust_image()
return return
fi fi
ls trust*.img >/dev/null 2>&1 && rm trust*.img rm trust*.img -rf
if [ "$FILE" != "" ]; then if [ "$FILE" != "" ]; then
ini=$FILE; ini=$FILE;
else else
@ -713,7 +712,7 @@ function pack_fit_image()
./scripts/fit-vboot.sh $* ./scripts/fit-vboot.sh $*
else else
./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild ./scripts/fit-vboot-uboot.sh --no-vboot --no-rebuild
ls uboot.img trust*.img >/dev/null 2>&1 && rm uboot.img trust*.img -rf rm uboot.img trust*.img -rf
echo "pack uboot.img (with uboot trust) okay! Input: $ini" echo "pack uboot.img (with uboot trust) okay! Input: $ini"
fi fi
} }
@ -734,13 +733,13 @@ function pack_images()
function clean_files() function clean_files()
{ {
if [ -f spl/u-boot-spl.dtb ]; then if [ -f spl/u-boot-spl.dtb ]; then
rm spl/u-boot-spl.dtb rm spl/u-boot-spl.dtb -rf
fi fi
if [ -f tpl/u-boot-tpl.dtb ]; then if [ -f tpl/u-boot-tpl.dtb ]; then
rm tpl/u-boot-tpl.dtb rm tpl/u-boot-tpl.dtb -rf
fi fi
if [ -f u-boot.dtb ]; then if [ -f u-boot.dtb ]; then
rm u-boot.dtb rm u-boot.dtb -rf
fi fi
} }