Merge branch 'master' into radar

Conflicts:
	autogen.sh

diff --cc autogen.sh
index 5d79159c41b774b46c40beced6030cab58e412f7,83b4201eeb96575fa6a4ca1aac306e42d566fc98..a5896559b3ff79c0dfe8d5be206c7ba69fdff3a2
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh
@@@ -27,20 -27,19 +27,22 @@@ case "$1" i
                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_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
 -              fi
  
-               fi
 +
 +              if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
 +                      echo -n "Prepare firmware image..."
 +                      tools/src/fwprepare carlfw/carl9170.fw
-               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."
        ;;