Merge branch 'master' into radar

Conflicts:
	autogen.sh

diff --cc autogen.sh
index a5896559b3ff79c0dfe8d5be206c7ba69fdff3a2,287d7a2cd476e37ae7f27c53ab8e252357588ee7..bb52416a2566a1c9bb7e7d27da16b24534ccee4d
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh
@@@ -27,20 -27,17 +27,16 @@@ case "$1" i
                make
  
                echo -n "Installing firmware..."
-               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
 +
                        if [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
                                echo -n "Apply miniboot..."
 -                              # also adds checksum
 +                              # also update checksum
                                tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
 -                      else
 -                              echo -n "Add checksum..."
 -                              tools/src/checksum carlfw/carl9170.fw
                        fi
                fi
 -
                install -m 644 carlfw/carl9170.fw \
                        ../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
                echo "done."