From: Christian Lamparter <chunkeey@googlemail.com>
Date: Mon, 14 Jan 2013 19:53:27 +0000 (+0100)
Subject: Merge branch 'master' into radar
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=410bb3d7523e9db8b56cd435369fc210d7cc8157;p=carl9170fw.git

Merge branch 'master' into radar

Conflicts:
	autogen.sh
---

410bb3d7523e9db8b56cd435369fc210d7cc8157
diff --cc autogen.sh
index 5d79159,83b4201..a589655
--- a/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
  
 +
 +		if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
 +			echo -n "Prepare firmware image..."
 +			tools/src/fwprepare carlfw/carl9170.fw
- 		fi
 +
- 		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."
  	;;