From 068b8f582296224591200104ab6f92fac537078e Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 07 Feb 2015 21:55:24 -0500
Subject: various fixes for r20150208

---
(limited to 'x60flashfrom5')

diff --git a/x60flashfrom5 b/x60flashfrom5
deleted file mode 100755
index 60ce99b..0000000
--- a/x60flashfrom5
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-#  x60flashfrom5 script: for X60 owners upgrading from 5th release
-#
-#	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
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
-   exit 1
-fi
-if (( $# != 1 )); then
-	echo "Usage: ./x60flashfrom5 yourrom.rom"
-	echo "usage: ./x60flashfrom5 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
-
-path="unknown"
-if [ -f "DEBLOB" ]; then
-	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:boardmismatch=force -w $1
--
cgit v0.9.1