diff options
| -rwxr-xr-x | build-release | 4 | ||||
| -rw-r--r-- | docs/install/images/x200/soic8.jpg | bin | 0 -> 158293 bytes | |||
| -rw-r--r-- | docs/install/index.html | 8 | ||||
| -rw-r--r-- | docs/install/x200_external.html | 7 | ||||
| -rwxr-xr-x | forceflash (renamed from x60flashfrom5) | 13 |
5 files changed, 20 insertions, 12 deletions
diff --git a/build-release b/build-release index 43d2a65..2e8c006 100755 --- a/build-release +++ b/build-release @@ -331,8 +331,8 @@ cp coreboot/src/mainboard/apple/macbook21/cmos.layout libreboot_bin/macbook21cmo # FLASHING SCRIPTS # 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/ +# Brick-prone flashing script (for mismatching board names, when they change) +cp forceflash libreboot_bin/ # X60/T60: so that the user can use libreboot_bin to overwrite lenovo bios with libreboot cp lenovobios_firstflash libreboot_bin/ cp lenovobios_secondflash libreboot_bin/ diff --git a/docs/install/images/x200/soic8.jpg b/docs/install/images/x200/soic8.jpg Binary files differnew file mode 100644 index 0000000..ad0b2fb --- /dev/null +++ b/docs/install/images/x200/soic8.jpg diff --git a/docs/install/index.html b/docs/install/index.html index 60d9a73..97462fd 100644 --- a/docs/install/index.html +++ b/docs/install/index.html @@ -394,9 +394,11 @@ <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> + If you are sure that you are flashing the correct image but you get the error + <b>This coreboot image (LENOVO:ThinkPad X60) does not appear to be correct for the detected mainboard (Lenovo:ThinkPad X60 / X60s / X60t) or + similar (if it's a different board), then do</b>: + <br/> + <b>$ sudo ./forceflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b> </p> <div class="important"> diff --git a/docs/install/x200_external.html b/docs/install/x200_external.html index f990789..6922b90 100644 --- a/docs/install/x200_external.html +++ b/docs/install/x200_external.html @@ -94,6 +94,8 @@ POMONA 5250 (correlate with the BBB guide) 3.3V PSU RED - - 17 - this is pin 1 on the flash chip. in front of it is the screen. === right side of the X200 (where the audio jacks are) === <i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i> +Here is a photo of the SOIC-8 flash chip: <a href="images/x200/soic8.jpg" alt="freenode IRC #libreboot 01:42 UK/London timezone February 8th 2015: pehjota: fchmmr: Here are two photos in the camera's configured resolution; resize them as you wish: http://www.pehjota.net/~pj/x200/soic-8/. License: CC BY-SA 3.0 or later. If you want other angles or anything, let me know.">images/x200/soic8.jpg</a> +(image copyright 2015 Patrick P.J. McDermott <pj@pehjota.net>, CC BY-SA 3.0 or later) </pre> <p> <b>On the X200S the flash chip is underneath the board, in a WSON package. @@ -101,6 +103,11 @@ POMONA 5250 (correlate with the BBB guide) <a href="images/x200/wson_soldered.jpg">images/x200/wson_soldered.jpg</a> (image copyright (C) 2014 <a href="mailto:sgsit@libreboot.org">Steve Shenton</a> under CC-BY-SA 4.0 or higher, same license that this document uses) shows it wired (soldered) and connected to a BBB.</b> + <br/> + In this image, a pin header was soldered onto the WSON. Another solution might be to de-solder the WSON-8 chip and put a SOIC-8 there instead. + Check the list of SOIC-8 flash chips at <a href="../hcl/x200_remove_me.html#flashchips">../hcl/x200_remove_me.html#flashchips</a> but + do note that these are only 4MiB (32Mb) chips. The only X200 SPI chips with 8MiB capacity are SOIC-8. For 8MiB capacity in this case, + the X201 SOIC-8 flash chip (Macronix 25L6445E) might work. </p> <h2> diff --git a/x60flashfrom5 b/forceflash index 60ce99b..64d4d68 100755 --- a/x60flashfrom5 +++ b/forceflash @@ -1,8 +1,10 @@ #!/bin/bash -# x60flashfrom5 script: for X60 owners upgrading from 5th release +# forceflash script - be very careful when using this, because it can flash +# the wrong ROM image on the wrong machine if you tell it to. YOU HAVE BEEN WARNED. +# This script is for re-flashing a new image for the same machine when the board name was changed # -# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015 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 @@ -27,8 +29,8 @@ if [[ $EUID -ne 0 ]]; then exit 1 fi if (( $# != 1 )); then - echo "Usage: ./x60flashfrom5 yourrom.rom" - echo "usage: ./x60flashfrom5 path/to/yourrom.rom" + echo "Usage: ./forceflash yourrom.rom" + echo "usage: ./forceflash path/to/yourrom.rom" echo "You need to specify exactly 1 file" exit 1 fi @@ -37,9 +39,6 @@ if [ ! -f $1 ]; then 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" |
