X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=autogen.sh;h=0c4776dbc68549a3da4b1e21e211e97824f00bbb;hb=9e6d350f787db96dc270ee78ba9c8a9c95ecd8cf;hp=8a47b51d57b4b8367e94089a65946c6cc368e466;hpb=188f2a6ac8f0b9e497d25a9b7c136de556e098a6;p=carl9170fw.git

diff --git a/autogen.sh b/autogen.sh
index 8a47b51..0c4776d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 case "$1" in
 	config)
 		echo "Configuring..."
+		pushd config
+		cmake .
+		make
+		popd
+		shift 1
+		config/conf Kconfig "$@"
 		cmake .
-		make -C config
-		config/conf Kconfig
 	;;
 
 	compile)
 		echo "Compile time..."
 		make
-
 	;;
 
 	install)
@@ -22,20 +25,26 @@ case "$1" in
 		fi
 
 		. ./.config
+		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
+		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 update checksum
+				tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
+			fi
 		fi
-
-		sudo install carlfw/carl9170.fw /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+		install -m 644 carlfw/carl9170.fw \
+			../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
 		echo "done."
 	;;
 
 	*)
-		$0 config
+		$0 config "$@"
 		$0 compile
 	;;