Lubancat2/device_rockchip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "common: mkfirmware: pack image only if needed"

Browse Source
This commit is contained in:
Eddie.Cai
2018-09-13 18:14:33 +08:00
committed by Gerrit Code Review
parent 097a6bc661 df5ed3e924
commit 75b101678a
1 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
common/mkfirmware.sh
View File

@ -15,7 +15,7 @@ ROCKDEV=$TOP_DIR/rockdev
PARAMETER=$TOP_DIR/device/rockchip/$RK_TARGET_PRODUCT/$RK_PARAMETER PARAMETER=$TOP_DIR/device/rockchip/$RK_TARGET_PRODUCT/$RK_PARAMETER
OEM_DIR=$TOP_DIR/device/rockchip/oem/$RK_OEM_DIR OEM_DIR=$TOP_DIR/device/rockchip/oem/$RK_OEM_DIR
USER_DATA_DIR=$TOP_DIR/device/rockchip/userdata/$RK_USERDATA_DIR USER_DATA_DIR=$TOP_DIR/device/rockchip/userdata/$RK_USERDATA_DIR
MISC_IMG=$TOP_DIR/device/rockchip/rockimg/wipe_all-misc.img MISC_IMG=$TOP_DIR/device/rockchip/rockimg/$RK_MISC
ROOTFS_IMG=$TOP_DIR/$RK_ROOTFS_IMG ROOTFS_IMG=$TOP_DIR/$RK_ROOTFS_IMG
RECOVERY_IMG=$TOP_DIR/buildroot/output/$RK_CFG_RECOVERY/images/recovery.img RECOVERY_IMG=$TOP_DIR/buildroot/output/$RK_CFG_RECOVERY/images/recovery.img
TRUST_IMG=$TOP_DIR/u-boot/trust.img TRUST_IMG=$TOP_DIR/u-boot/trust.img
@ -27,13 +27,16 @@ MKOEM=$TOP_DIR/device/rockchip/common/mk-oem.sh
MKUSERDATA=$TOP_DIR/device/rockchip/common/mk-userdata.sh MKUSERDATA=$TOP_DIR/device/rockchip/common/mk-userdata.sh
mkdir -p $ROCKDEV mkdir -p $ROCKDEV
if [ -f $ROOTFS_IMG ] if [ $RK_ROOTFS_IMG ]
then then
echo -n "create rootfs.img..." if [ -f $ROOTFS_IMG ]
ln -s -f $ROOTFS_IMG $ROCKDEV/rootfs.img then
echo "done." echo -n "create rootfs.img..."
else ln -s -f $ROOTFS_IMG $ROCKDEV/rootfs.img
echo -e "\e[31m error: $ROOTFS_IMG not found! \e[0m" echo "done."
else
echo "warning: $ROOTFS_IMG not found!"
fi
fi fi
if [ -f $PARAMETER ] if [ -f $PARAMETER ]
@ -42,43 +45,55 @@ then
ln -s -f $PARAMETER $ROCKDEV/parameter.txt ln -s -f $PARAMETER $ROCKDEV/parameter.txt
echo "done." echo "done."
else else
echo -e "\e[31m error: $PARAMETER not found! \e[0m" echo "warning: $PARAMETER not found!"
fi fi
if [ -f $RECOVERY_IMG ] if [ $RK_CFG_RECOVERY ]
then then
echo -n "create recovery.img..." if [ -f $RECOVERY_IMG ]
ln -s -f $RECOVERY_IMG $ROCKDEV/recovery.img then
echo "done." echo -n "create recovery.img..."
else ln -s -f $RECOVERY_IMG $ROCKDEV/recovery.img
echo -e "\e[31m error: $RECOVERY_IMG not found! \e[0m" echo "done."
else
echo "warning: $RECOVERY_IMG not found!"
fi
fi fi
if [ -f $MISC_IMG ] if [ $RK_MISC ]
then then
echo -n "create misc.img..." if [ -f $MISC_IMG ]
ln -s -f $MISC_IMG $ROCKDEV/misc.img then
echo "done." echo -n "create misc.img..."
else ln -s -f $MISC_IMG $ROCKDEV/misc.img
echo -e "\e[31m error: $MISC_IMG not found! \e[0m" echo "done."
else
echo "warning: $MISC_IMG not found!"
fi
fi fi
if [ -d $OEM_DIR ] if [ $RK_OEM_DIR ]
then then
echo -n "create oem.img..." if [ -d $OEM_DIR ]
$MKOEM $OEM_DIR $ROCKDEV/oem.img $RK_OEM_FS_TYPE then
echo "done." echo -n "create oem.img..."
else $MKOEM $OEM_DIR $ROCKDEV/oem.img $RK_OEM_FS_TYPE
echo -e "\e[31m error: create oem image fail! \e[0m" echo "done."
else
echo "warning: $OEM_DIR not found!"
fi
fi fi
if [ -d $USER_DATA_DIR ] if [ $RK_USERDATA_DIR ]
then then
echo -n "create userdata.img..." if [ -d $USER_DATA_DIR ]
$MKUSERDATA $USER_DATA_DIR $ROCKDEV/userdata.img $RK_USERDATA_FS_TYPE then
echo "done." echo -n "create userdata.img..."
else $MKUSERDATA $USER_DATA_DIR $ROCKDEV/userdata.img $RK_USERDATA_FS_TYPE
echo -e "\e[31m error: $USER_DATA_DIR not found! \e[0m" echo "done."
else
echo "warning: $USER_DATA_DIR not found!"
fi
fi fi
if [ -f $UBOOT_IMG ] if [ -f $UBOOT_IMG ]
@ -118,13 +133,16 @@ fi
# rm $SPINOR_LOADER_PATH 2>/dev/null # rm $SPINOR_LOADER_PATH 2>/dev/null
#fi #fi
if [ -f $BOOT_PATH ] if [ $RK_BOOT_IMG ]
then then
echo -n "create boot.img..." if [ -f $BOOT_IMG ]
ln -s -f $BOOT_IMG $ROCKDEV/boot.img then
echo "done." echo -n "create boot.img..."
else ln -s -f $BOOT_IMG $ROCKDEV/boot.img
echo -e "\e[31m error: $BOOT_IMG not found! \e[0m" echo "done."
else
echo "warning: $BOOT_IMG not found!"
fi
fi fi
echo -e "\e[36m Image: image in rockdev is ready \e[0m" echo -e "\e[36m Image: image in rockdev is ready \e[0m"