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

diff --git a/autogen.sh b/autogen.sh
index c8e9f9c70b53078448a1b6a4fe07856b4cea66ae..0c4776dbc68549a3da4b1e21e211e97824f00bbb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,14 +34,10 @@ case "$1" in
 
                        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."

diff --git a/tools/.gitignore b/tools/.gitignore
index efb38dd499f2110870e4c116c3aee633e85671fe..50aa8854316bd47447a7f4b60b5eea4bfa9d34fe 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,6 +1,5 @@
 src/checksum
 src/fwinfo
-src/fwprepare
 src/miniboot
 src/fwprepare
 src/wol

diff --git a/tools/src/fwprepare.c b/tools/src/fwprepare.c
index 67a00db7564fd55cb3c46585a32219aebcc6713e..f5e780635245c0915b8d46d132c6aeceeb41323b 100644 (file)
--- a/tools/src/fwprepare.c
+++ b/tools/src/fwprepare.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "carlfw.h"
-
 #include "compiler.h"
 #include "pattern.h"