From 888ed0dc86174ee729ae95093b15e307e93d18a1 Mon Sep 17 00:00:00 2001
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Date: Fri, 27 May 2022 10:11:45 +0800
Subject: [PATCH] mk-image.sh: Support size in hex

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

Change-Id: Ic850906f47f83f0e2a176241481ba39bce3606be
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
 common/mk-image.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/mk-image.sh b/common/mk-image.sh
index 2cc3e53..224caa6 100755
--- a/common/mk-image.sh
+++ b/common/mk-image.sh
@@ -18,10 +18,11 @@ fatal()
 
 usage()
 {
+    echo $@
     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 TARGET=$2
@@ -34,14 +35,14 @@ case $SIZE in
         SIZE_KB=0
         ;;
     *K)
-        SIZE_KB=${SIZE%K}
+        SIZE_KB=$(( ${SIZE%K} ))
         ;;
     *)
         SIZE_KB=$(( ${SIZE%M} * 1024 )) # default is MB
         ;;
 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
     UBI_VOL_NAME=${LABEL:-test}
@@ -53,7 +54,7 @@ fi
 
 TEMP=$(mktemp -u)
 
-[ -d "$SRC_DIR" ] || usage
+[ -d "$SRC_DIR" ] || usage "No such src dir: $SRC_DIR"
 
 copy_to_ntfs()
 {
@@ -244,7 +245,6 @@ case $FS_TYPE in
         mkfs.jffs2 -r $SRC_DIR -o $TARGET 0x10000 --pad=0x400000 -s 0x1000 -n
         ;;
     *)
-        echo "File system: $FS_TYPE not supported."
-        usage
+        usage "File system: $FS_TYPE not supported."
         ;;
 esac