Merge remote-tracking branch 'refs/remotes/origin/radar' into radar

[carl9170fw.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 83b4201eeb96575fa6a4ca1aac306e42d566fc98..0c4776dbc68549a3da4b1e21e211e97824f00bbb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,7 +9,8 @@ case "$1" in
                cmake .
                make
                popd
-               config/conf Kconfig
+               shift 1
+               config/conf Kconfig "$@"
                cmake .
        ;;
 
@@ -28,23 +29,22 @@ case "$1" in
 
                echo -n "Installing firmware..."
                if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
-
-               if [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
-                       echo -n "Apply miniboot..."
-                       # also adds checksum
-                       tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
-               else
-                       echo -n "Add checksum..."
-                       tools/src/checksum carlfw/carl9170.fw
+                       echo -n "Prepare firmware image..."
+                       tools/src/fwprepare carlfw/carl9170.fw
+
+                       if [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
+                               echo -n "Apply miniboot..."
+                               # also update checksum
+                               tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
+                       fi
                fi
-
                install -m 644 carlfw/carl9170.fw \
                        ../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
                echo "done."
        ;;
 
        *)
-               $0 config
+               $0 config "$@"
                $0 compile
        ;;