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

Merge "common: fix make ubi filesystem"

Browse Source
This commit is contained in:
Weiwen Chen
2020-11-14 10:26:13 +08:00
committed by Gerrit Code Review
parent e2814586ec f547f6a3d0
commit 814944c724
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
common/mk-image.sh
View File

@ -26,6 +26,15 @@ export SRC_DIR=$1
export TARGET=$2
FS_TYPE=$3
SIZE=$4
if [ "$FS_TYPE" = "ubi" ]; then
UBI_VOL_NAME=${5:-test}
# default page size 2KB
UBI_PAGE_SIZE=${6:-2048}
# default block size 128KB
UBI_BLOCK_SIZE=${7:-0x20000}
fi
TEMP=$(mktemp -u)
[ -d "$SRC_DIR" ] || usage
@ -127,12 +136,34 @@ mkimage_auto_sized()
mk_ubi_image()
{
UBINIZE_CONFIG_FILE_PATH=$TARGET_OUTPUT_DIR/../../fs/ubi/ubinize.cfg
mkfs.ubifs -x lzo -e $RK_UBIFS_LEBSIZE -c $RK_UBIFS_MINIOSIZE -m $RK_UBIFS_MAXLEBCNT -d $SRC_DIR -F -v -o temp.ubifs --jrn-size=1048576
sed 's/BR2_ROOTFS_UBIFS_PATH/temp.ubifs/g' $UBINIZE_CONFIG_FILE_PATH > ubinize.cfg
ubinize -o $TARGET -m $RK_UBIFS_MINIOSIZE -p 0x20000 -s $RK_UBIFS_MAXLEBCNT -v ubinize.cfg
rm ubinize.cfg
rm temp.ubifs
temp_dir="`dirname $TARGET`"
temp_ubifs_image=$temp_dir/temp.ubifs
temp_ubinize_file=$temp_dir/ubinize.cfg
ubifs_lebsize=$(( $UBI_BLOCK_SIZE - 2 * $UBI_PAGE_SIZE ))
ubifs_miniosize=$UBI_PAGE_SIZE
partition_size=$(( $SIZE ))
if [ $partition_size -le 0 ]; then
echo "Error: ubifs partition MUST set partition size"
exit 1
fi
ubifs_maxlebcnt=$(( $partition_size / $ubifs_lebsize ))
echo "ubifs_lebsize=$UBI_BLOCK_SIZE"
echo "ubifs_miniosize=$UBI_PAGE_SIZE"
echo "ubifs_maxlebcnt=$ubifs_maxlebcnt"
mkfs.ubifs -x lzo -e $ubifs_lebsize -m $ubifs_miniosize -c $ubifs_maxlebcnt -d $SRC_DIR -F -v -o $temp_ubifs_image
echo "[ubifs]" > $temp_ubinize_file
echo "mode=ubi" >> $temp_ubinize_file
echo "vol_id=0" >> $temp_ubinize_file
echo "vol_type=dynamic" >> $temp_ubinize_file
echo "vol_name=$UBI_VOL_NAME" >> $temp_ubinize_file
echo "vol_alignment=1" >> $temp_ubinize_file
echo "vol_flags=autoresize" >> $temp_ubinize_file
echo "image=$temp_ubifs_image" >> $temp_ubinize_file
ubinize -o $TARGET -m $ubifs_miniosize -p $UBI_BLOCK_SIZE -v $temp_ubinize_file
rm -f $temp_ubifs_image $temp_ubinize_file
}
rm -rf $TARGET

12
common/mkfirmware.sh
View File

@ -183,7 +183,11 @@ then
if [ -d $OEM_DIR/www ]; then
echo "chown -R www-data:www-data $OEM_DIR/www" >> $OEM_FAKEROOT_SCRIPT
fi
echo "$MKIMAGE $OEM_DIR $ROCKDEV/oem.img $RK_OEM_FS_TYPE" >> $OEM_FAKEROOT_SCRIPT
if [ "$RK_OEM_FS_TYPE" = "ubi" ]; then
echo "$MKIMAGE $OEM_DIR $ROCKDEV/oem.img $RK_OEM_FS_TYPE $RK_OEM_PARTITION_SIZE oem $RK_UBI_PAGE_SIZE $RK_UBI_BLOCK_SIZE" >> $OEM_FAKEROOT_SCRIPT
else
echo "$MKIMAGE $OEM_DIR $ROCKDEV/oem.img $RK_OEM_FS_TYPE" >> $OEM_FAKEROOT_SCRIPT
fi
chmod a+x $OEM_FAKEROOT_SCRIPT
$FAKEROOT_TOOL -- $OEM_FAKEROOT_SCRIPT
rm -f $OEM_FAKEROOT_SCRIPT
@ -202,7 +206,11 @@ then
then
echo "#!/bin/sh" > $USERDATA_FAKEROOT_SCRIPT
echo "set -e" >> $USERDATA_FAKEROOT_SCRIPT
echo "$MKIMAGE $USER_DATA_DIR $ROCKDEV/userdata.img $RK_USERDATA_FS_TYPE" >> $USERDATA_FAKEROOT_SCRIPT
if [ "$RK_USERDATA_FS_TYPE" = "ubi" ]; then
echo "$MKIMAGE $USER_DATA_DIR $ROCKDEV/userdata.img $RK_USERDATA_FS_TYPE $RK_USERDATA_PARTITION_SIZE userdata $RK_UBI_PAGE_SIZE $RK_UBI_BLOCK_SIZE" >> $USERDATA_FAKEROOT_SCRIPT
else
echo "$MKIMAGE $USER_DATA_DIR $ROCKDEV/userdata.img $RK_USERDATA_FS_TYPE" >> $USERDATA_FAKEROOT_SCRIPT
fi
chmod a+x $USERDATA_FAKEROOT_SCRIPT
$FAKEROOT_TOOL -- $USERDATA_FAKEROOT_SCRIPT
rm -f $USERDATA_FAKEROOT_SCRIPT