x60flashfrom5 (new), for X60 users upgrading from 5th/early release

3 files changed, 51 insertions, 0 deletions

diff --git a/build-release b/build-release
index 96f5ed6..82cb065 100755
--- a/build-release
+++ b/build-release
@@ -164,6 +164,9 @@ cp lenovobios_secondflash libreboot_bin/
 # Flashrom script (makes flashing easier: ./flash path/to/libreboot.rom)
 cp flash libreboot_bin/
 
+# For those upgrading from libreboot 5th release (or lower) to latest, on the X60
+cp x60flashfrom5 libreboot_bin/
+
 # patch the version of cbfstool included in libreboot_bin,
 # so that it can be built/executed standalone
 # this modification is only suitable for the version included in libreboot_bin
diff --git a/docs/install/index.html b/docs/install/index.html
index 1402cfc..bfae94e 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -370,6 +370,11 @@
 			Flash the ROM:<br/>
 			<b>$ sudo ./flash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
 		</p>
+		<p>
+			If you are flashing a ThinkPad X60 that is currently running libreboot 5th release or lower 
+			(anything on or before June 22nd 2014), then use this to upgrade:<br/>
+			<b>$ sudo ./x60flashfrom5 bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
+		</p>
 
 		<div class="important">
 
diff --git a/x60flashfrom5 b/x60flashfrom5
new file mode 100755
index 0000000..1f8e0ec
--- /dev/null
+++ b/x60flashfrom5
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+#  flash script: uses flashrom to flash a new libreboot ROM image onto your machine
+#
+#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+## Don't add here. errors are expected.
+# set -u -e -v
+set -v
+
+# 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 "You need to specify exactly 1 file"
+	exit 1
+fi
+if [ ! -f $1 ]; then
+	echo "File not found!"
+	exit 1
+fi
+
+# 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
+
+./flashrom/flashrom -p internal:boardmismatch=force -w $1
+