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

mk-image.sh: Support size in hex

Browse Source 
Tested with:
./mk-image.sh . /tmp/test.ubi ubi 0x6400000K

Change-Id: Ic850906f47f83f0e2a176241481ba39bce3606be
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen
2022-05-27 10:11:45 +08:00
parent 819dead533
commit 888ed0dc86
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/mk-image.sh
View File

@ -18,10 +18,11 @@ fatal()
usage() usage()
{ {
echo $@
fatal "Usage: $0 <src_dir> <target_image> <fs_type> <size(M|K)|auto(0)> [label]" fatal "Usage: $0 <src_dir> <target_image> <fs_type> <size(M|K)|auto(0)> [label]"
} }
[ ! $# -lt 4 ] || usage [ ! $# -lt 4 ] || usage "Not enough args${@+: $0 $@}"
export SRC_DIR=$1 export SRC_DIR=$1
export TARGET=$2 export TARGET=$2
@ -34,14 +35,14 @@ case $SIZE in
SIZE_KB=0 SIZE_KB=0
;; ;;
*K) *K)
SIZE_KB=${SIZE%K} SIZE_KB=$(( ${SIZE%K} ))
;; ;;
*) *)
SIZE_KB=$(( ${SIZE%M} * 1024 )) # default is MB SIZE_KB=$(( ${SIZE%M} * 1024 )) # default is MB
;; ;;
esac esac
echo $SIZE_KB | grep -vq [^0-9] || usage echo $SIZE_KB | grep -vq [^0-9] || usage "Invalid size: $SIZE_KB"
if [ "$FS_TYPE" = "ubi" ]; then if [ "$FS_TYPE" = "ubi" ]; then
UBI_VOL_NAME=${LABEL:-test} UBI_VOL_NAME=${LABEL:-test}
@ -53,7 +54,7 @@ fi
TEMP=$(mktemp -u) TEMP=$(mktemp -u)
[ -d "$SRC_DIR" ] || usage [ -d "$SRC_DIR" ] || usage "No such src dir: $SRC_DIR"
copy_to_ntfs() copy_to_ntfs()
{ {
@ -244,7 +245,6 @@ case $FS_TYPE in
mkfs.jffs2 -r $SRC_DIR -o $TARGET 0x10000 --pad=0x400000 -s 0x1000 -n mkfs.jffs2 -r $SRC_DIR -o $TARGET 0x10000 --pad=0x400000 -s 0x1000 -n
;; ;;
*) *)
echo "File system: $FS_TYPE not supported." usage "File system: $FS_TYPE not supported."
usage
;; ;;
esac esac