X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=autogen.sh;h=8a47b51d57b4b8367e94089a65946c6cc368e466;hb=03a8cf510dbef554b55403da7547607f7e326368;hp=43dbce6e9bc21a32d2f8639045a4ed1177a2a62f;hpb=e72388a0aa23da8bc8e24a0cbe9d523c5a9ce294;p=carl9170fw.git

diff --git a/autogen.sh b/autogen.sh
index 43dbce6..8a47b51 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,9 +5,9 @@ set -e
 case "$1" in
 	config)
 		echo "Configuring..."
+		cmake .
 		make -C config
 		config/conf Kconfig
-		cmake .
 	;;
 
 	compile)
@@ -23,14 +23,15 @@ case "$1" in
 
 		. ./.config
 
-
-		if [ "$CONFIG_CARL9170FW_MAKE_RELEASE" = "y" ]; then
-			echo "Installing firmware..."
-			tmpfwfile=`mktemp`
-			cat carlfw/carl9170.fw carlfw/carl9170.dsc > $tmpfwfile
-			install $tmpfwfile /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
-			rm $tmpfwfile
+		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
+
+		sudo install carlfw/carl9170.fw /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+		echo "done."
 	;;
 
 	*)