diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-12-30 18:59:33 (EST) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-12-30 19:55:43 (EST) |
| commit | 97eb0d8ec18bea2536696f072375587165d90958 (patch) | |
| tree | 4f5893c26a2f4861dda1e6d0974943b6da4e1903 /x60flashfrom5 | |
| parent | 683935870d5b7d01e8793811ea161239fa084e69 (diff) | |
| download | libreboot-97eb0d8ec18bea2536696f072375587165d90958.zip libreboot-97eb0d8ec18bea2536696f072375587165d90958.tar.gz libreboot-97eb0d8ec18bea2536696f072375587165d90958.tar.bz2 | |
Refactored the flashing scripts
Diffstat (limited to 'x60flashfrom5')
| -rwxr-xr-x | x60flashfrom5 | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/x60flashfrom5 b/x60flashfrom5 index b9c3067..60ce99b 100755 --- a/x60flashfrom5 +++ b/x60flashfrom5 @@ -22,27 +22,13 @@ # 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 - if (( $# != 1 )); then - echo "Usage: ./lenovobios_firstflash yourrom.rom" - echo "usage: ./lenovobios_firstflash path/to/yourrom.rom" + echo "Usage: ./x60flashfrom5 yourrom.rom" + echo "usage: ./x60flashfrom5 path/to/yourrom.rom" echo "You need to specify exactly 1 file" exit 1 fi @@ -54,16 +40,16 @@ 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 - # Means we are in src archive or git - ./flashrom/flashrom -p internal:boardmismatch=force -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:boardmismatch=force -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:boardmismatch=force -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:boardmismatch=force -w $1 |