Merge branch 'master' into radar

[carl9170fw.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5d79159c41b774b46c40beced6030cab58e412f7..a5896559b3ff79c0dfe8d5be206c7ba69fdff3a2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,20 +27,22 @@ case "$1" in
                make
 
                echo -n "Installing firmware..."
-               if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
-                  [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
-                       echo -n "Apply miniboot..."
-                       tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
-               fi
+               if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
+
 
 
                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
+                       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."
        ;;