From 97eb0d8ec18bea2536696f072375587165d90958 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 30 Dec 2014 18:59:33 -0500
Subject: Refactored the flashing scripts

---
(limited to 'macbook21_firstflash')

diff --git a/macbook21_firstflash b/macbook21_firstflash
index 1b31401..31fd813 100755
--- a/macbook21_firstflash
+++ b/macbook21_firstflash
@@ -18,34 +18,17 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-## Don't add this here. Errors are *expected*
+## Don't add here. errors are expected.
 # set -u -e -v
 set -v
 
-if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
-	then
-		echo "Running on i686. ok."
-		sleep 5
-elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
-	then
-		echo "Running on x86_64. ok."
-		sleep 5
-else
-	echo "This script must be run on an i686 or x86_64 host. x86_64 is recommended."
-	exit 1
-fi
-
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 
    exit 1
 fi
-
-# USE ROOT OR SUDO WHEN EXECUTING THIS
-# uses flashrom to flash the rom
-
 if (( $# != 1 )); then
-	echo "Usage: ./lenovobios_firstflash yourrom.rom"
-	echo "usage: ./lenovobios_firstflash path/to/yourrom.rom"
+	echo "Usage: ./macbook21_firstflash yourrom.rom"
+	echo "usage: ./macbook21_firstflash path/to/yourrom.rom"
 	echo "You need to specify exactly 1 file"
 	exit 1
 fi
@@ -54,18 +37,20 @@ if [ ! -f $1 ]; then
 	exit 1
 fi
 
-# flashrom doesn't recognize the machine unless you use that switch: laptop=force_I_want_a_brick
-# after flashing libreboot and booting the machine, flashing normally will just work.
+# boardmismatch=force is for people upgrading from libreboot 5th release, where the new ROM's are "ThinkPad X60 / X60s / X60t"
+# and the old ones are "ThinkPad X60 / X60s" and flashrom complains otherwise
 
+path="unknown"
 if [ -f "DEBLOB" ]; then
-	# Means we are in src archive or git
-	./flashrom/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-elif [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
-	then
-		# Means we are in bin archive and on an i686 host
-		./flashrom/i686/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
-	then
-		# Means we are in bin archive and on an x86_64 host
-		./flashrom/x86_64/flashrom -p internal:laptop=force_I_want_a_brick -w $1
+	path="./flashrom/flashrom"
+elif [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]; then
+	path="./flashrom/i686/flashrom"
+elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]; then
+	path="./flashrom/x86_64/flashrom"
+else
+	echo "This script must be run on an i686 or x86_64 host. x86_64 is recommended."
+	exit 1
 fi
+
+$(echo $path) -p internal:laptop=force_I_want_a_brick -w $1
+
--
cgit v0.9.1