Merge branch 'master' into radar

[carl9170fw.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 873fb7490c17739a1d58ad8703a5670cd6011e6c..5d79159c41b774b46c40beced6030cab58e412f7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,6 +24,7 @@ case "$1" in
                fi
 
                . ./.config
+               make
 
                echo -n "Installing firmware..."
                if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
@@ -32,7 +33,14 @@ case "$1" in
                        tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
                fi
 
-               sudo install carlfw/carl9170.fw /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+
+               if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
+                       echo -n "Prepare firmware image..."
+                       tools/src/fwprepare carlfw/carl9170.fw
+               fi
+
+               sudo install -m 644 carlfw/carl9170.fw \
+                       /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
                echo "done."
        ;;