scripts: fix dl_cleanup.py argument handling

[openwrt/staging/dedeckeh.git] / scripts / mkits.sh

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 7bf5681addf097c40e60a93131e6836fdd37a193..bf75d69f09cc09008b5f6099863b6dd54ebd545f 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -35,6 +35,7 @@ usage() {
        printf "\n\t-l ==> legacy mode character (@ etc otherwise -)"
        printf "\n\t-o ==> create output file 'its_file'"
        printf "\n\t-O ==> create config with dt overlay 'name:dtb'"
+       printf "\n\t-s ==> set FDT load address to 'addr' (hex)"
        printf "\n\t\t(can be specified more than once)\n"
        exit 1
 }
@@ -48,7 +49,7 @@ LOADABLES=
 DTOVERLAY=
 DTADDR=
 
-while getopts ":A:a:c:C:D:d:e:f:i:k:l:n:o:O:v:r:H:" OPTION
+while getopts ":A:a:c:C:D:d:e:f:i:k:l:n:o:O:v:r:s:H:" OPTION
 do
        case $OPTION in
                A ) ARCH=$OPTARG;;
@@ -66,6 +67,7 @@ do
                o ) OUTPUT=$OPTARG;;
                O ) DTOVERLAY="$DTOVERLAY ${OPTARG}";;
                r ) ROOTFS=$OPTARG;;
+               s ) FDTADDR=$OPTARG;;
                H ) HASH=$OPTARG;;
                v ) VERSION=$OPTARG;;
                * ) echo "Invalid option passed to '$0' (options:$*)"
@@ -87,10 +89,14 @@ if [ -n "${COMPATIBLE}" ]; then
 fi
 
 [ "$DTOVERLAY" ] && {
-       dtbsize=$(wc -c "$DTB" | cut -d' ' -f1)
+       dtbsize=$(wc -c "$DTB" | awk '{print $1}')
        DTADDR=$(printf "0x%08x" $(($LOAD_ADDR - $dtbsize)) )
 }
 
+[ "$FDTADDR" ] && {
+       DTADDR="$FDTADDR"
+}
+
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
        FDT_NODE="
@@ -162,7 +168,7 @@ OVCONFIGS=""
        overlay_blob=${overlay##*:}
        ovname=${overlay%%:*}
        ovnode="fdt-$ovname"
-       ovsize=$(wc -c "$overlay_blob" | cut -d' ' -f1)
+       ovsize=$(wc -c "$overlay_blob" | awk '{print $1}')
        echo "$ovname ($overlay_blob) : $ovsize" >&2
        DTADDR=$(printf "0x%08x" $(($DTADDR - $ovsize)))
        FDTOVERLAY_NODE="$FDTOVERLAY_NODE