summaryrefslogtreecommitdiffstats
path: root/docs/install
diff options
context:
space:
mode:
Diffstat (limited to 'docs/install')
-rw-r--r--docs/install/bbb_setup.html159
-rw-r--r--docs/install/index.html617
-rw-r--r--docs/install/t60_unbrick.html499
-rw-r--r--docs/install/x200_external.html271
-rw-r--r--docs/install/x60_unbrick.html471
-rw-r--r--docs/install/x60tablet_unbrick.html277
6 files changed, 1181 insertions, 1113 deletions
diff --git a/docs/install/bbb_setup.html b/docs/install/bbb_setup.html
index 3ccebc7..ee2326f 100644
--- a/docs/install/bbb_setup.html
+++ b/docs/install/bbb_setup.html
@@ -13,70 +13,69 @@
<body>
- <header>
+ <div class="section">
<h1 id="pagetop">Setup the BeagleBone Black as an SPI flashrom programmer</h1>
- <aside>How to use the BBB as an external flashrom programmer, for reading/writing an SPI flash chip.</aside>
- </header>
+ <p>How to use the BBB as an external flashrom programmer, for reading/writing an SPI flash chip.</p>
+ <p><a href="index.html">Back to previous index</a></p>
+ </div>
- <p>Or go <a href="index.html">back to main index</a></p>
+ <div class="section">
-<hr/>
-
- <h1 id="hardware_requirements">Hardware requirements</h1>
-
- <p>
- Shopping list (pictures of this hardware is shown later):
- </p>
- <ul>
- <li>
- External SPI programmer: <b>BeagleBone Black</b> (rev. C)
- is highly recommended. Sometimes referred to as 'BBB'.
- </li>
- <li>
- Clip for connecting to the flash chip: <b>Pomona 5250</b>
- (SOIC-8) or <b>Pomona 5252</b> (SOIC-16) is recommended
- (<b>X200S and X200 Tablet users will need a soldering iron
- instead</b>, because of the type of package the flash chip is
- in on those machines).
- </li>
- <li>
- <b>External 3.3V DC power supply</b>. The one used by this
- author has the label HF100W-SF-3.3 on it, but any decent
- supply will be fine. Some people use the 3.3V from an ATX
- PSU for instance (the kind that you get on a typical
- Intel/AMD desktop computer. 6A supply should be fine,
- the one used by this author is 20A (it won't actually use
- that, it's just what the PSU is capable of).
- </li>
- <li>
- Dupont <b>jumper cables</b> (2.54mm / 0.1&quot; headers)
- You should get male-male, male-female and female-female
- cables in 10cm and 20cm sizes. Just get a load of them.
- </li>
- <li>
- <b>Mini USB A-B cable</b> (the BeagleBone probably already comes
- with one.)
- </li>
- <li>
- <b>FTDI serial board</b>, for unbricking the BeagleBone if
- necessary.
- </li>
- <li>
- <b>5V DC power supply</b> (from wall outlet to the BeagleBone).
- The BeagleBone can have power supplied via USB, but a
- dedicated power supply is recommended.
- </li>
- </ul>
-
- <p>
- <a href="#pagetop">Back to top of page.</a>
- </p>
+ <h1 id="hardware_requirements">Hardware requirements</h1>
+
+ <p>
+ Shopping list (pictures of this hardware is shown later):
+ </p>
+ <ul>
+ <li>
+ External SPI programmer: <b>BeagleBone Black</b> (rev. C)
+ is highly recommended. Sometimes referred to as 'BBB'.
+ </li>
+ <li>
+ Clip for connecting to the flash chip: <b>Pomona 5250</b>
+ (SOIC-8) or <b>Pomona 5252</b> (SOIC-16) is recommended
+ (<b>X200S and X200 Tablet users will need a soldering iron
+ instead</b>, because of the type of package the flash chip is
+ in on those machines).
+ </li>
+ <li>
+ <b>External 3.3V DC power supply</b>. The one used by this
+ author has the label HF100W-SF-3.3 on it, but any decent
+ supply will be fine. Some people use the 3.3V from an ATX
+ PSU for instance (the kind that you get on a typical
+ Intel/AMD desktop computer. 6A supply should be fine,
+ the one used by this author is 20A (it won't actually use
+ that, it's just what the PSU is capable of).
+ </li>
+ <li>
+ Dupont <b>jumper cables</b> (2.54mm / 0.1&quot; headers)
+ You should get male-male, male-female and female-female
+ cables in 10cm and 20cm sizes. Just get a load of them.
+ </li>
+ <li>
+ <b>Mini USB A-B cable</b> (the BeagleBone probably already comes
+ with one.)
+ </li>
+ <li>
+ <b>FTDI serial board</b>, for unbricking the BeagleBone if
+ necessary.
+ </li>
+ <li>
+ <b>5V DC power supply</b> (from wall outlet to the BeagleBone).
+ The BeagleBone can have power supplied via USB, but a
+ dedicated power supply is recommended.
+ </li>
+ </ul>
+
+ <p>
+ <a href="#pagetop">Back to top of page.</a>
+ </p>
+
+ </div>
-<hr/>
+ <div class="section">
- <h1 id="configure_bbb">Configuring the BeagleBone Black</h1>
-
- <h2>Setting up the 3.3V DC PSU</h2>
+ <h1>Setting up the 3.3V DC PSU</h1>
<p>
With my PSU, first I had wire up the mains power cable. Any clover or kettle lead will do. Cut the end off (not the one
that goes in the wall, but the kettle/clover connector).
@@ -107,7 +106,12 @@
If you are using a different PSU, then the steps will change from those above. Anyway, once you are satisfied,
continue reading...
</p>
- <h2>Setting up the BBB</h2>
+
+ </div>
+
+ <div class="section">
+
+ <h1>Setting up the BBB</h1>
<p>
Your BBB will have an sshd with no password on root. Find it's IP address
(it will use DHCP by default) and set a root password. The steps below
@@ -265,9 +269,14 @@ Note: flashrom can never write if the flash chip isn't found automatically.
This means that it's working (the clip isn't connected to any flash chip,
so the error is fine).
</p>
- <h2>
+
+ </div>
+
+ <div class="section">
+
+ <h1>
Connecting the Pomona 5250/5252
- </h2>
+ </h1>
<p>
Use this image for reference when connecting the pomona to the BBB:
<a href="http://beagleboard.org/Support/bone101#headers">http://beagleboard.org/Support/bone101#headers</a>
@@ -326,20 +335,24 @@ Note: flashrom can never write if the flash chip isn't found automatically.
<p>
<a href="#pagetop">Back to top of page.</a>
</p>
+
+ </div>
-<hr/>
+ <div class="section">
- <p>
- Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
+ <p>
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+ </p>
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+ <p>
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
+ </p>
+
+ </div>
</body>
</html>
diff --git a/docs/install/index.html b/docs/install/index.html
index 313c724..60d9a73 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -13,17 +13,25 @@
<body>
- <h1 id="pagetop">Installing libreboot</h1>
- <p>
- This section relates to installing libreboot on supported targets.
- </p>
- <p>
- Or <a href="../index.html">Back to main index</a>.
- </p>
+ <div class="section">
+
+ <h1 id="pagetop">Installing libreboot</h1>
+ <p>
+ This section relates to installing libreboot on supported targets.
+ </p>
+ <p>
+ <a href="../index.html">Back to previous index</a>
+ </p>
+
+ </div>
+
+ <div class="section">
+
<h2>Setting up external programmers</h2>
<ul>
<li><a href="bbb_setup.html">Setup the BeagleBone Black as an SPI flashrom programmer</a></li>
</ul>
+
<h2>Installing libreboot (software)</h2>
<ul>
<li><a href="#qemu">QEMU</a></li>
@@ -41,379 +49,396 @@
<li><a href="x200_external.html">ThinkPad X200: How to unbrick</a> (also the initial installation guide for this machine)</li>
</ul>
-<hr/>
-
- <h1 id="qemu">QEMU</h1>
-
- <p>
- You don't really do anything here, just run (example):<br/>
- $ <b>qemu-system-i386 -M pc -m 512 -bios bin/qemu_i440fx_piix4/qemu_i440fx_piix4_ukdvorak_vesafb.rom -serial stdio</b><br/>
- $ <b>qemu-system-i386 -M q35 -m 512 -bios bin/qemu_q35_ich9/qemu_q35_ich9_ukdvorak_vesafb.rom -serial stdio</b>
- </p>
-
-<hr/>
+ </div>
+
+ <div class="section">
- <h1 id="rom">Recommended ROMs to flash</h1>
-
- <p>
- List of directories corresponding to each board:
- </p>
- <ul>
- <li>ThinkPad X60, X60s and X60 Tablet: <b>bin/x60/</b></li>
- <li>ThinkPad T60: <b>bin/t60/</b> (note, see <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a>)</li>
- <li>ThinkPad X200: <b>bin/x200_8mb/</b> (8MiB flash chip) or <b>bin/x200_4mb</b> (4MiB flash chip) (see <a href="../hcl/x200.html">../hcl/x200.html</a>)</li>
- <li>Apple MacBook2,1: <b>bin/macbook21/</b></li>
- <li>Apple MacBook1,1: <b>bin/macbook21/</b> (it's not a typo; the same ROMs work)</li>
- </ul>
-
- <p>These images use coreboot text-mode graphics:</p>
- <ul>
- <li>US Qwerty keyboard: <b><i>boardname</i>_usqwerty_txtmode.rom</b></li>
- <li>UK Qwerty keyboard: <b><i>boardname</i>_ukqwerty_txtmode.rom</b></li>
- <li>US Dvorak keyboard: <b><i>boardname</i>_usdvorak_txtmode.rom</b></li>
- <li>UK Dvorak keyboard: <b><i>boardname</i>_ukdvorak_txtmode.rom</b></li>
- <li>French Azerty keyboard: <b><i>boardname</i>_frazerty_txtmode.rom</b></li>
- <li>French Dvorak (BEPO): <b><i>boardname</i>_frdvbepo_txtmode.rom</b></li>
- <li>Italian Qwerty keyboard: <b><i>boardname</i>_itqwerty_txtmode.rom</b></li>
- <li>Swedish Qwerty keyboard: <b><i>boardname</i>_svenska_txtmode.rom</b></li>
- </ul>
- <p>These images use coreboot framebuffer graphics:</p>
- <ul>
- <li>US Qwerty keyboard: <b><i>boardname</i>_usqwerty_vesafb.rom</b></li>
- <li>UK Qwerty keyboard: <b><i>boardname</i>_ukqwerty_vesafb.rom</b></li>
- <li>US Dvorak keyboard: <b><i>boardname</i>_usdvorak_vesafb.rom</b></li>
- <li>UK Dvorak keyboard: <b><i>boardname</i>_ukdvorak_vesafb.rom</b></li>
- <li>French Azerty keyboard: <b><i>boardname</i>_frazerty_vesafb.rom</b></li>
- <li>French Dvorak (BEPO): <b><i>boardname</i>_frdvbepo_vesafb.rom</b></li>
- <li>Italian Qwerty keyboard: <b><i>boardname</i>_itqwerty_vesafb.rom</b></li>
- <li>Swedish Qwerty keyboard: <b><i>boardname</i>_svenska_vesafb.rom</b></li>
- </ul>
+ <h1 id="qemu">QEMU</h1>
+
+ <p>
+ You don't really do anything here, just run (example):<br/>
+ $ <b>qemu-system-i386 -M pc -m 512 -bios bin/qemu_i440fx_piix4/qemu_i440fx_piix4_ukdvorak_vesafb.rom -serial stdio</b><br/>
+ $ <b>qemu-system-i386 -M q35 -m 512 -bios bin/qemu_q35_ich9/qemu_q35_ich9_ukdvorak_vesafb.rom -serial stdio</b>
+ </p>
+ <p>
+ <a href="#pagetop">Back to top of page</a>.
+ </p>
- <p>
- The boards for <i>boardname</i> in the examples above can be found by the names of the directories
- in <b>./bin/</b> or <b>./resources/libreboot/config/</b>.
- </p>
-
- <p>
- _txtmode images come with a working MemTest86+ and GRUB Invaders, both of which require text-mode.
- _vesafb images are recommended in most cases.
- </p>
-
- <p>
- This will give you your native keyboard layout inside GRUB. The preferences in your OS are not affected, it just makes using
- the GRUB command line easier (if you ever need to do that).
- <a href="../grub/index.html#grub_keyboard">../grub/index.html#grub_keyboard</a> shows you how this was done. If your native keyboard layout
- differs, you can adapt those notes and hack the 'build' script for your needs.
- </p>
-
- <p><a href="#pagetop">Back to top of page.</a></p>
-
-<hr/>
+ </div>
- <h1 id="flashrom_lenovobios">X60/X60S/X60T/T60: How to flash the ROMs onto your machine (if running Lenovo BIOS firmware).</h1>
+ <div class="section">
- <div class="important">
+ <h1 id="rom">Recommended ROMs to flash</h1>
<p>
- Hover over the next paragraph to make it black.
+ List of directories corresponding to each board:
</p>
- <p class="lenovobios">
- Following this guide means simply flashing a libreboot ROM. This guide will not (directly) teach you how to make a backup (dump) of the original Lenovo BIOS
- because to do so would be to explicitly endorse proprietary software. However, for the purposes of reverse engineering it can be useful
- to have a backup. Each copy of the original Lenovo BIOS is tied to the specific machine that it came from; it will not run
- on any other machine, even if it's the same type of machine as yours. What this means is that, effectively, you can back it up now (so that you can
- re-flash it later if you want to run the original Lenovo BIOS again) or lose it forever. The X60/T60 installation
- guide on the coreboot wiki will show you how to do this:
- <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.<br/>
- Do not make this decision lightly! This is your last and only chance.
+ <ul>
+ <li>ThinkPad X60, X60s and X60 Tablet: <b>bin/x60/</b></li>
+ <li>ThinkPad T60: <b>bin/t60/</b> (note, see <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a>)</li>
+ <li>ThinkPad X200: <b>bin/x200_8mb/</b> (8MiB flash chip) or <b>bin/x200_4mb</b> (4MiB flash chip) (see <a href="../hcl/x200.html">../hcl/x200.html</a>)</li>
+ <li>Apple MacBook2,1: <b>bin/macbook21/</b></li>
+ <li>Apple MacBook1,1: <b>bin/macbook21/</b> (it's not a typo; the same ROMs work)</li>
+ </ul>
+
+ <p>These images use coreboot text-mode graphics:</p>
+ <ul>
+ <li>US Qwerty keyboard: <b><i>boardname</i>_usqwerty_txtmode.rom</b></li>
+ <li>UK Qwerty keyboard: <b><i>boardname</i>_ukqwerty_txtmode.rom</b></li>
+ <li>US Dvorak keyboard: <b><i>boardname</i>_usdvorak_txtmode.rom</b></li>
+ <li>UK Dvorak keyboard: <b><i>boardname</i>_ukdvorak_txtmode.rom</b></li>
+ <li>French Azerty keyboard: <b><i>boardname</i>_frazerty_txtmode.rom</b></li>
+ <li>French Dvorak (BEPO): <b><i>boardname</i>_frdvbepo_txtmode.rom</b></li>
+ <li>Italian Qwerty keyboard: <b><i>boardname</i>_itqwerty_txtmode.rom</b></li>
+ <li>Swedish Qwerty keyboard: <b><i>boardname</i>_svenska_txtmode.rom</b></li>
+ </ul>
+ <p>These images use coreboot framebuffer graphics:</p>
+ <ul>
+ <li>US Qwerty keyboard: <b><i>boardname</i>_usqwerty_vesafb.rom</b></li>
+ <li>UK Qwerty keyboard: <b><i>boardname</i>_ukqwerty_vesafb.rom</b></li>
+ <li>US Dvorak keyboard: <b><i>boardname</i>_usdvorak_vesafb.rom</b></li>
+ <li>UK Dvorak keyboard: <b><i>boardname</i>_ukdvorak_vesafb.rom</b></li>
+ <li>French Azerty keyboard: <b><i>boardname</i>_frazerty_vesafb.rom</b></li>
+ <li>French Dvorak (BEPO): <b><i>boardname</i>_frdvbepo_vesafb.rom</b></li>
+ <li>Italian Qwerty keyboard: <b><i>boardname</i>_itqwerty_vesafb.rom</b></li>
+ <li>Swedish Qwerty keyboard: <b><i>boardname</i>_svenska_vesafb.rom</b></li>
+ </ul>
+
+ <p>
+ The boards for <i>boardname</i> in the examples above can be found by the names of the directories
+ in <b>./bin/</b> or <b>./resources/libreboot/config/</b>.
</p>
<p>
- The following is for the libreboot image and *not* the factory bios dump:
+ _txtmode images come with a working MemTest86+ and GRUB Invaders, both of which require text-mode.
+ _vesafb images are recommended in most cases.
</p>
+
<p>
- Check the last two 64K regions in your ROM file (libreboot.rom in this example):<br/>
- <b>$ dd if=libreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s libreboot.rom) - 0x10000] count=64k</b><br/>
- <b>$ dd if=libreboot.rom of=lower64k.bin bs=1 skip=$[$(stat -c %s libreboot.rom) - 0x20000] count=64k</b><br/>
- <b>$ sha512sum lower64k.bin top64k.bin</b><br/>
- Make *sure* that they match before you continue. The ROMs included pre-compiled in libreboot should already match.
- If they don't match, then do this (based on those instructions from <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">coreboot wiki</a>):<br/>
- <b>$ dd if=top64k.bin of=libreboot.rom bs=1 seek=$[$(stat -c %s libreboot.rom) - 0x20000] count=64k conv=notrunc</b><br/>
- After this, the ROM will be safe to flash. Explanation is provided in <a href="../git/index.html#build_bucts">../git/index.html#build_bucts</a>.
+ This will give you your native keyboard layout inside GRUB. The preferences in your OS are not affected, it just makes using
+ the GRUB command line easier (if you ever need to do that).
+ <a href="../grub/index.html#grub_keyboard">../grub/index.html#grub_keyboard</a> shows you how this was done. If your native keyboard layout
+ differs, you can adapt those notes and hack the 'build' script for your needs.
</p>
- </div>
-
- <p><b>This is for the ThinkPad X60 and T60 while running Lenovo BIOS. If you already have coreboot or libreboot running,
- then go to <a href="#flashrom">#flashrom</a> instead!</b></p>
-
- <p><b>If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a></b></p>
+ <p><a href="#pagetop">Back to top of page.</a></p>
+
+ </div>
+
+ <div class="section">
+
+ <h1 id="flashrom_lenovobios">X60/X60S/X60T/T60: How to flash the ROMs onto your machine (if running Lenovo BIOS firmware).</h1>
+
+ <div class="important">
+
+ <p>
+ Hover over the next paragraph to make it black.
+ </p>
+ <p class="lenovobios">
+ Following this guide means simply flashing a libreboot ROM. This guide will not (directly) teach you how to make a backup (dump) of the original Lenovo BIOS
+ because to do so would be to explicitly endorse proprietary software. However, for the purposes of reverse engineering it can be useful
+ to have a backup. Each copy of the original Lenovo BIOS is tied to the specific machine that it came from; it will not run
+ on any other machine, even if it's the same type of machine as yours. What this means is that, effectively, you can back it up now (so that you can
+ re-flash it later if you want to run the original Lenovo BIOS again) or lose it forever. The X60/T60 installation
+ guide on the coreboot wiki will show you how to do this:
+ <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.<br/>
+ Do not make this decision lightly! This is your last and only chance.
+ </p>
+
+ <p>
+ The following is for the libreboot image and *not* the factory bios dump:
+ </p>
+ <p>
+ Check the last two 64K regions in your ROM file (libreboot.rom in this example):<br/>
+ <b>$ dd if=libreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s libreboot.rom) - 0x10000] count=64k</b><br/>
+ <b>$ dd if=libreboot.rom of=lower64k.bin bs=1 skip=$[$(stat -c %s libreboot.rom) - 0x20000] count=64k</b><br/>
+ <b>$ sha512sum lower64k.bin top64k.bin</b><br/>
+ Make *sure* that they match before you continue. The ROMs included pre-compiled in libreboot should already match.
+ If they don't match, then do this (based on those instructions from <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">coreboot wiki</a>):<br/>
+ <b>$ dd if=top64k.bin of=libreboot.rom bs=1 seek=$[$(stat -c %s libreboot.rom) - 0x20000] count=64k conv=notrunc</b><br/>
+ After this, the ROM will be safe to flash. Explanation is provided in <a href="../git/index.html#build_bucts">../git/index.html#build_bucts</a>.
+ </p>
+
+ </div>
+
+ <p><b>This is for the ThinkPad X60 and T60 while running Lenovo BIOS. If you already have coreboot or libreboot running,
+ then go to <a href="#flashrom">#flashrom</a> instead!</b></p>
+
+ <p><b>If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a></b></p>
+
+ <div class="important">
+ <p>
+ <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
+ </p>
+ </div>
+
+ <p>&quot;YOURBOARD/YOURROM&quot; should be replaced with what is correct as per <a href="#rom">#rom</a>. Alternatively
+ you may be using your own custom ROM. Adapt.</p>
- <div class="important">
<p>
- <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
+ Run the script:<br/>
+ <b>$ sudo ./lenovobios_firstflash bin/<a href="#rom">YOURBOARD/YOURROM</a>.</b>
</p>
- </div>
- <p>&quot;YOURBOARD/YOURROM&quot; should be replaced with what is correct as per <a href="#rom">#rom</a>. Alternatively
- you may be using your own custom ROM. Adapt.</p>
+ <div class="important">
- <p>
- Run the script:<br/>
- <b>$ sudo ./lenovobios_firstflash bin/<a href="#rom">YOURBOARD/YOURROM</a>.</b>
- </p>
+ <p>
+ You should see within the output the following:<br/>
+ <b>&quot;Updated BUC.TS=1 - 64kb address ranges at 0xFFFE0000 and 0xFFFF0000 are swapped&quot;</b>.
+ </p>
- <div class="important">
+ <p>
+ You should also see within the output the following:<br/>
+ <b>&quot;Flash chip is in an unknown state&quot;</b>, <b>&quot;FAILED&quot;</b> and <b>&quot;DO NOT SHUTDOWN OR REBOOT&quot;</b><br/>
+ Seeing this means that the operation was a <b>resounding</b> success! <b>DON'T PANIC</b>.
+ </p>
- <p>
- You should see within the output the following:<br/>
- <b>&quot;Updated BUC.TS=1 - 64kb address ranges at 0xFFFE0000 and 0xFFFF0000 are swapped&quot;</b>.
- </p>
+ <p>
+ See this link for more details:
+ <a href="http://thread.gmane.org/gmane.linux.bios.flashrom/575">http://thread.gmane.org/gmane.linux.bios.flashrom/575</a>.
+ </p>
- <p>
- You should also see within the output the following:<br/>
- <b>&quot;Flash chip is in an unknown state&quot;</b>, <b>&quot;FAILED&quot;</b> and <b>&quot;DO NOT SHUTDOWN OR REBOOT&quot;</b><br/>
- Seeing this means that the operation was a <b>resounding</b> success! <b>DON'T PANIC</b>.
- </p>
+ <p>
+ If the above is what you see, then <b>SHUT DOWN</b>. Wait a few seconds, and then boot; libreboot is running, but there is a 2nd procedure <b>*needed*</b> (see below).
+ </p>
+
+ </div>
<p>
- See this link for more details:
- <a href="http://thread.gmane.org/gmane.linux.bios.flashrom/575">http://thread.gmane.org/gmane.linux.bios.flashrom/575</a>.
+ <b>
+ If you boot and you see nothing, try turning up the backlight (Fn+Home).
+ </b>
</p>
<p>
- If the above is what you see, then <b>SHUT DOWN</b>. Wait a few seconds, and then boot; libreboot is running, but there is a 2nd procedure <b>*needed*</b> (see below).
+ When you have booted up again:<br/>
+ <b>$ sudo ./lenovobios_secondflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
</p>
- </div>
+ <div class="important">
- <p>
- <b>
- If you boot and you see nothing, try turning up the backlight (Fn+Home).
- </b>
- </p>
+ <p>
+ You should see within the output the following:<br/>
+ <b>&quot;Updated BUC.TS=0 - 128kb address range 0xFFFE0000-0xFFFFFFFF is untranslated&quot;</b>
+ </p>
- <p>
- When you have booted up again:<br/>
- <b>$ sudo ./lenovobios_secondflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
- </p>
+ <p>
+ You should also see within the output the following:<br/>
+ <b>&quot;Verifying flash... VERIFIED.&quot;</b>
+ </p>
- <div class="important">
+ <p>Shut down again, wait a few seconds, and then boot.</p>
- <p>
- You should see within the output the following:<br/>
- <b>&quot;Updated BUC.TS=0 - 128kb address range 0xFFFE0000-0xFFFFFFFF is untranslated&quot;</b>
- </p>
+ </div>
<p>
- You should also see within the output the following:<br/>
- <b>&quot;Verifying flash... VERIFIED.&quot;</b>
+ Some thinkpads come with WWAN cards installed, along with sim cards. These use non-free firmware and should be removed.
+ You might also want to remove bluetooth. See <a href="../security/x60_security.html">../security/x60_security.html</a> and
+ <a href="../security/t60_security.html">../security/t60_security.html</a>.
</p>
- <p>Shut down again, wait a few seconds, and then boot.</p>
+ <p><a href="#pagetop">Back to top of page.</a></p>
+
+ </div>
- </div>
+ <div class="section">
- <p>
- Some thinkpads come with WWAN cards installed, along with sim cards. These use non-free firmware and should be removed.
- You might also want to remove bluetooth. See <a href="../security/x60_security.html">../security/x60_security.html</a> and
- <a href="../security/t60_security.html">../security/t60_security.html</a>.
- </p>
+ <h1 id="flashrom_macbook21">macbook21: How to flash your ROM (if running Apple EFI firmware)</h1>
- <p><a href="#pagetop">Back to top of page.</a></p>
+ <div class="important">
-<hr/>
+ <p>
+ Hover over the next paragraph to make it black.
+ </p>
+ <p class="lenovobios">
+ Following this guide means simply flashing a libreboot ROM. This guide will not (directly) teach you how to make a backup (dump) of the original Apple EFI firmware
+ because to do so would be to explicitly endorse proprietary software. However, for the purposes of reverse engineering it can be useful
+ to have a backup. Each copy of the original Apple EFI is (believed, but unproven to be) tied to the specific machine that it came from; it will not (as is believed) run
+ on any other machine, even if it's the same type of machine as yours. What this means is that, effectively, you can back it up now (so that you can
+ re-flash it later if you want to run the original Apple EFI firmware again) or lose it forever. The macbook21 installation
+ guide on the coreboot wiki will show you how to do this:
+ <a href="http://www.coreboot.org/Board:apple/macbook21">http://www.coreboot.org/Board:apple/macbook21</a>.<br/>
+ Do not make this decision lightly! This is (very likely) your last and only chance.
+ </p>
- <h1 id="flashrom_macbook21">macbook21: How to flash your ROM (if running Apple EFI firmware)</h1>
+ <p>
+ (this theory is untested at the time of writing)
+ </p>
- <div class="important">
+ <p>
+ Note: <b>If you have a MacBook1,1 then these instructions will not work. See <a href="../hcl/index.html#macbook11">../hcl/index.html#macbook11</a> for MacBook1,1 flashing instructions.</b>
+ </p>
+
+ </div>
<p>
- Hover over the next paragraph to make it black.
+ <b>
+ This is for the MacBook2,1 while running Apple EFI firmware. If you already have
+ coreboot or libreboot running, then go to <a href="#flashrom">#flashrom</a> instead!
+ </b>
</p>
- <p class="lenovobios">
- Following this guide means simply flashing a libreboot ROM. This guide will not (directly) teach you how to make a backup (dump) of the original Apple EFI firmware
- because to do so would be to explicitly endorse proprietary software. However, for the purposes of reverse engineering it can be useful
- to have a backup. Each copy of the original Apple EFI is (believed, but unproven to be) tied to the specific machine that it came from; it will not (as is believed) run
- on any other machine, even if it's the same type of machine as yours. What this means is that, effectively, you can back it up now (so that you can
- re-flash it later if you want to run the original Apple EFI firmware again) or lose it forever. The macbook21 installation
- guide on the coreboot wiki will show you how to do this:
- <a href="http://www.coreboot.org/Board:apple/macbook21">http://www.coreboot.org/Board:apple/macbook21</a>.<br/>
- Do not make this decision lightly! This is (very likely) your last and only chance.
+
+ <p>
+ Be sure to read the information in <a href="../hcl/index.html#macbook21">../hcl/index.html#macbook21</a>.
</p>
+ <div class="important">
+ <p>
+ <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
+ </p>
+ </div>
+
<p>
- (this theory is untested at the time of writing)
+ Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternatively you may be using your own
+ custom ROM. Adapt.
</p>
<p>
- Note: <b>If you have a MacBook1,1 then these instructions will not work. See <a href="../hcl/index.html#macbook11">../hcl/index.html#macbook11</a> for MacBook1,1 flashing instructions.</b>
+ Flashing is actually easy (compared to X60/T60).<br/>
+ <b>$ sudo flashrom -p internal:laptop=force_I_want_a_brick -w bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
</p>
- </div>
+ <p>
+ Alternatively, a script is provided which does the same thing:<br/>
+ <b>$ sudo ./macbook21_firstflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
+ </p>
- <p>
- <b>
- This is for the MacBook2,1 while running Apple EFI firmware. If you already have
- coreboot or libreboot running, then go to <a href="#flashrom">#flashrom</a> instead!
- </b>
- </p>
+ <div class="important">
- <p>
- Be sure to read the information in <a href="../hcl/index.html#macbook21">../hcl/index.html#macbook21</a>.
- </p>
+ <p>
+ You should also see within the output the following:<br/>
+ <b>&quot;Verifying flash... VERIFIED.&quot;</b>
+ </p>
- <div class="important">
- <p>
- <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
- </p>
- </div>
+ <p>
+ If you see that, great! Shut down now (power off). Wait a few seconds and then boot!
+ </p>
- <p>
- Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternatively you may be using your own
- custom ROM. Adapt.
- </p>
+ <p>
+ <b>
+ If you boot and you see nothing, try turning up the backlight (F2 for macbook21).
+ </b>
+ </p>
- <p>
- Flashing is actually easy (compared to X60/T60).<br/>
- <b>$ sudo flashrom -p internal:laptop=force_I_want_a_brick -w bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
- </p>
- <p>
- Alternatively, a script is provided which does the same thing:<br/>
- <b>$ sudo ./macbook21_firstflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
- </p>
+ </div>
+
+ <p><a href="#pagetop">Back to top of page.</a></p>
+
+ </div>
- <div class="important">
+ <div class="section">
+
+ <h1 id="flashrom">X60/X60S/X60T/T60/X200/macbook21: How to flash the ROMs onto your machine (if running libreboot or coreboot already)</h1>
<p>
- You should also see within the output the following:<br/>
- <b>&quot;Verifying flash... VERIFIED.&quot;</b>
+ <b>
+ These instructions work for the Lenovo ThinkPad X60/X60S/X60T/T60 and Apple MacBook2,1.
+ </b>
</p>
-
<p>
- If you see that, great! Shut down now (power off). Wait a few seconds and then boot!
+ <b>
+ This assumes that you already have coreboot or libreboot running.
+ </b>
</p>
-
<p>
<b>
- If you boot and you see nothing, try turning up the backlight (F2 for macbook21).
+ If you have Lenovo BIOS running (X60/X60S/X60T/T60), go to <a href="#flashrom_lenovobios">#flashrom_lenovobios</a> instead.
</b>
</p>
-
-
- </div>
-
- <p><a href="#pagetop">Back to top of page.</a></p>
-
-<hr/>
-
- <h1 id="flashrom">X60/X60S/X60T/T60/X200/macbook21: How to flash the ROMs onto your machine (if running libreboot or coreboot already)</h1>
-
- <p>
- <b>
- These instructions work for the Lenovo ThinkPad X60/X60S/X60T/T60 and Apple MacBook2,1.
- </b>
- </p>
- <p>
- <b>
- This assumes that you already have coreboot or libreboot running.
- </b>
- </p>
- <p>
- <b>
- If you have Lenovo BIOS running (X60/X60S/X60T/T60), go to <a href="#flashrom_lenovobios">#flashrom_lenovobios</a> instead.
- </b>
- </p>
- <p>
- <b>
- If you have Lenovo BIOS running (X200), go to <a href="x200_external.html">x200_external.html</a> instead.
- </b>
- </p>
- <p>
- <b>
- If you have Apple EFI firmware running (macbook21), go to <a href="#flashrom_macbook21">#flashrom_macbook21</a> instead.
- </b>
- </p>
- <p>
- <b>
- If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a>.
- </b>
- </p>
- <p>
- <b>
- If you have an X200 with libreboot or coreboot already running, note that
- the Gbe in the boot flash contains your MAC address. You will need to change the default
- MAC address inside the ROM images before flashing a new libreboot image. See
- <a href="../hcl/x200_remove_me.html#ich9gen">ich9gen</a> for details.
-
- Another important note about the X200: even if you do already have libreboot or coreboot,
- it is possible for the user to write-protect regions in the flash chip, by modifying
- the flash descriptor. If you have locked regions, you will need an external flasher
- (see <a href="x200_external.html">x200_external.html</a>) to re-flash those regions. By default,
- the X200 ROM images in libreboot contain a descriptor+gbe with all regions unlocked.
- </b>
- </p>
- <p>
- <b>
- If you are flashing an Apple MacBook2,1, be sure to read the information in <a href="../hcl/index.html#macbook21">../hcl/index.html#macbook21</a>.
- </b>
- </p>
- <div class="important">
<p>
- <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
+ <b>
+ If you have Lenovo BIOS running (X200), go to <a href="x200_external.html">x200_external.html</a> instead.
+ </b>
</p>
- </div>
- <p>
- Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternative you may be using your own
- custom ROM. Adapt.
- </p>
- <p>
- 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">
-
<p>
- You should see <b>&quot;Verifying flash... VERIFIED.&quot;</b> written at the end of the flashrom output. <b>SHUT DOWN</b>
- after you see this, and then boot up again after a few seconds.
+ <b>
+ If you have Apple EFI firmware running (macbook21), go to <a href="#flashrom_macbook21">#flashrom_macbook21</a> instead.
+ </b>
+ </p>
+ <p>
+ <b>
+ If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="../hcl/index.html#supported_t60_list">../hcl/index.html#supported_t60_list</a>.
+ </b>
+ </p>
+ <p>
+ <b>
+ If you have an X200 with libreboot or coreboot already running, note that
+ the Gbe in the boot flash contains your MAC address. You will need to change the default
+ MAC address inside the ROM images before flashing a new libreboot image. See
+ <a href="../hcl/x200_remove_me.html#ich9gen">ich9gen</a> for details.
+
+ Another important note about the X200: even if you do already have libreboot or coreboot,
+ it is possible for the user to write-protect regions in the flash chip, by modifying
+ the flash descriptor. If you have locked regions, you will need an external flasher
+ (see <a href="x200_external.html">x200_external.html</a>) to re-flash those regions. By default,
+ the X200 ROM images in libreboot contain a descriptor+gbe with all regions unlocked.
+ </b>
</p>
-
<p>
<b>
- If you boot and you see nothing, try turning up the backlight (Fn+Home for X60/X60S/X60T/T60/X200, F2 for macbook21).
+ If you are flashing an Apple MacBook2,1, be sure to read the information in <a href="../hcl/index.html#macbook21">../hcl/index.html#macbook21</a>.
</b>
</p>
+ <div class="important">
+ <p>
+ <b>If you are using libreboot_src or git, then make sure that you built the sources first (see <a href="../git/index.html#build">../git/index.html#build</a>).</b>
+ </p>
+ </div>
+ <p>
+ Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternative you may be using your own
+ custom ROM. Adapt.
+ </p>
+ <p>
+ 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>
+ <div class="important">
- <p>
- Some thinkpads come with WWAN cards installed, along with sim cards. These use non-free firmware and should be removed.
- You might also want to remove bluetooth. See <a href="../security/x60_security.html">../security/x60_security.html</a> and
- <a href="../security/t60_security.html">../security/t60_security.html</a>.
- </p>
+ <p>
+ You should see <b>&quot;Verifying flash... VERIFIED.&quot;</b> written at the end of the flashrom output. <b>SHUT DOWN</b>
+ after you see this, and then boot up again after a few seconds.
+ </p>
- <p><a href="#pagetop">Back to top of page</a></p>
+ <p>
+ <b>
+ If you boot and you see nothing, try turning up the backlight (Fn+Home for X60/X60S/X60T/T60/X200, F2 for macbook21).
+ </b>
+ </p>
-<hr/>
+ </div>
- <p>
- Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
+ <p>
+ Some thinkpads come with WWAN cards installed, along with sim cards. These use non-free firmware and should be removed.
+ You might also want to remove bluetooth. See <a href="../security/x60_security.html">../security/x60_security.html</a> and
+ <a href="../security/t60_security.html">../security/t60_security.html</a>.
+ </p>
+
+ <p><a href="#pagetop">Back to top of page</a></p>
+
+ </div>
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+ <div class="section">
+
+ <p>
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+ </p>
+
+ <p>
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
+ </p>
+
+ </div>
</body>
</html>
diff --git a/docs/install/t60_unbrick.html b/docs/install/t60_unbrick.html
index ba010d3..a36f961 100644
--- a/docs/install/t60_unbrick.html
+++ b/docs/install/t60_unbrick.html
@@ -13,161 +13,166 @@
<body>
- <header>
+ <div class="section">
<h1>Unbricking the ThinkPad T60</h1>
- <aside>This guide will show you how to recover from a bad flash that prevents your ThinkPad T60 from booting.</aside>
- </header>
-
- <p>Or go <a href="index.html">back to main index</a></p>
-
- <h2>Table of Contents</h2>
- <ul>
- <li>
- Types of brick:
- <ul>
- <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
- <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
- </ul>
- </li>
- </ul>
-
- <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
- <p>
- You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
- the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
-
- In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
- <img src="../images/t60_dev/0006.JPG" alt="" /><br/><br/>
-
- *Those dd commands should be applied to all newly compiled T60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
- dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
- dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
- dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
- (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
- using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
- (it says x60, but instructions for t60 are identical)
- </p>
-
- <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
-
- <p>
- In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
- booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
- </p>
- <p>
- &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
- </p>
-
- <p>
- Remove those screws and remove the HDD:<br/>
- <img src="../images/t60_dev/0001.JPG" alt="" /> <img src="../images/t60_dev/0002.JPG" alt="" />
- </p>
-
- <p>
- Lift off the palm rest:<br/>
- <img src="../images/t60_dev/0003.JPG" alt="" />
- </p>
-
- <p>
- Lift up the keyboard, pull it back a bit, flip it over like that and then disconnect it from the board:<br/>
- <img src="../images/t60_dev/0004.JPG" alt="" /> <img src="../images/t60_dev/0005.JPG" alt="" /> <img src="../images/t60_dev/0006.JPG" alt="" />
- </p>
-
- <p>
- Gently wedge both sides loose:<br/>
- <img src="../images/t60_dev/0007.JPG" alt="" /> <img src="../images/t60_dev/0008.JPG" alt="" />
- </p>
-
- <p>
- Remove that cable from the position:<br/>
- <img src="../images/t60_dev/0009.JPG" alt="" /> <img src="../images/t60_dev/0010.JPG" alt="" />
- </p>
-
- <p>
- Now remove that bezel. Remove wifi, nvram battery and speaker connector (also remove 56k modem, on the left of wifi):<br/>
- <img src="../images/t60_dev/0011.JPG" alt="" />
- </p>
-
- <p>
- Remove those screws:<br/>
- <img src="../images/t60_dev/0012.JPG" alt="" />
- </p>
-
- <p>
- Disconnect the power jack:<br/>
- <img src="../images/t60_dev/0013.JPG" alt="" />
- </p>
-
- <p>
- Remove nvram battery:<br/>
- <img src="../images/t60_dev/0014.JPG" alt="" />
- </p>
-
- <p>
- Disconnect cable (for 56k modem) and disconnect the other cable:<br/>
- <img src="../images/t60_dev/0015.JPG" alt="" /> <img src="../images/t60_dev/0016.JPG" alt="" />
- </p>
-
- <p>
- Disconnect speaker cable:<br/>
- <img src="../images/t60_dev/0017.JPG" alt="" />
- </p>
-
- <p>
- Disconnect the other end of the 56k modem cable:<br/>
- <img src="../images/t60_dev/0018.JPG" alt="" />
- </p>
-
- <p>
- Make sure you removed it:<br/>
- <img src="../images/t60_dev/0019.JPG" alt="" />
- </p>
-
- <p>
- Unscrew those:<br/>
- <img src="../images/t60_dev/0020.JPG" alt="" />
- </p>
-
- <p>
- Make sure you removed those:<br/>
- <img src="../images/t60_dev/0021.JPG" alt="" />
- </p>
-
- <p>
- Disconnect LCD cable from board:<br/>
- <img src="../images/t60_dev/0022.JPG" alt="" />
- </p>
-
- <p>
- Remove those screws then remove the LCD assembly:<br/>
- <img src="../images/t60_dev/0023.JPG" alt="" /> <img src="../images/t60_dev/0024.JPG" alt="" /> <img src="../images/t60_dev/0025.JPG" alt="" />
- </p>
-
- <p>
- Once again, make sure you removed those:<br/>
- <img src="../images/t60_dev/0026.JPG" alt="" />
- </p>
-
- <p>
- Remove the shielding containing the motherboard, then flip it over. Remove these screws, placing them on a steady
- surface in the same layout as they were in before you removed them. Also, you should mark each screw hole after removing the
- screw (a permanent marker pen will do), this is so that you have a point of reference when re-assembling the machine:<br/>
- <img src="../images/t60_dev/0027.JPG" alt="" /> <img src="../images/t60_dev/0028.JPG" alt="" /> <img src="../images/t60_dev/0029.JPG" alt="" />
- <img src="../images/t60_dev/0031.JPG" alt="" /> <img src="../images/t60_dev/0032.JPG" alt="" /> <img src="../images/t60_dev/0033.JPG" alt="" />
- </p>
-
- <p>
- Now wire up the BBB and the Pomona with your PSU.<br/>
- Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
- the BBB for flashing.<br/>
- <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the T60:
- if you don't have or don't want to use an external PSU, then make
- sure not to connect the red/black 3.3v leads mentioned in the guide;
- instead, connect the AC adapter (the one that normally charges your
- battery) so that the board has power (but don't boot it up)</b><br/>
- <img src="../images/t60_dev/0030.JPG" alt="" /><br/>
- Correlate the following with the BBB guide linked above:
- </p>
+ <p>This guide will show you how to recover from a bad flash that prevents your ThinkPad T60 from booting.</p>
+ <p><a href="index.html">Back to previous index</a></p>
+ </div>
+
+ <div class="section">
+ <h2>Table of Contents</h2>
+ <ul>
+ <li>
+ Types of brick:
+ <ul>
+ <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
+ <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+
+ <div class="section">
+ <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
+ <p>
+ You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
+ the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
+
+ In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
+ <img src="../images/t60_dev/0006.JPG" alt="" /><br/><br/>
+
+ *Those dd commands should be applied to all newly compiled T60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
+ dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
+ dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
+ dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
+ (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
+ using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
+ (it says x60, but instructions for t60 are identical)
+ </p>
+ </div>
+
+ <div class="section">
+
+ <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
+
+ <p>
+ In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
+ booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
+ </p>
+ <p>
+ &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
+ </p>
+
+ <p>
+ Remove those screws and remove the HDD:<br/>
+ <img src="../images/t60_dev/0001.JPG" alt="" /> <img src="../images/t60_dev/0002.JPG" alt="" />
+ </p>
+
+ <p>
+ Lift off the palm rest:<br/>
+ <img src="../images/t60_dev/0003.JPG" alt="" />
+ </p>
+
+ <p>
+ Lift up the keyboard, pull it back a bit, flip it over like that and then disconnect it from the board:<br/>
+ <img src="../images/t60_dev/0004.JPG" alt="" /> <img src="../images/t60_dev/0005.JPG" alt="" /> <img src="../images/t60_dev/0006.JPG" alt="" />
+ </p>
+
+ <p>
+ Gently wedge both sides loose:<br/>
+ <img src="../images/t60_dev/0007.JPG" alt="" /> <img src="../images/t60_dev/0008.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove that cable from the position:<br/>
+ <img src="../images/t60_dev/0009.JPG" alt="" /> <img src="../images/t60_dev/0010.JPG" alt="" />
+ </p>
+
+ <p>
+ Now remove that bezel. Remove wifi, nvram battery and speaker connector (also remove 56k modem, on the left of wifi):<br/>
+ <img src="../images/t60_dev/0011.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove those screws:<br/>
+ <img src="../images/t60_dev/0012.JPG" alt="" />
+ </p>
+
+ <p>
+ Disconnect the power jack:<br/>
+ <img src="../images/t60_dev/0013.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove nvram battery:<br/>
+ <img src="../images/t60_dev/0014.JPG" alt="" />
+ </p>
+
+ <p>
+ Disconnect cable (for 56k modem) and disconnect the other cable:<br/>
+ <img src="../images/t60_dev/0015.JPG" alt="" /> <img src="../images/t60_dev/0016.JPG" alt="" />
+ </p>
+
+ <p>
+ Disconnect speaker cable:<br/>
+ <img src="../images/t60_dev/0017.JPG" alt="" />
+ </p>
+
+ <p>
+ Disconnect the other end of the 56k modem cable:<br/>
+ <img src="../images/t60_dev/0018.JPG" alt="" />
+ </p>
+
+ <p>
+ Make sure you removed it:<br/>
+ <img src="../images/t60_dev/0019.JPG" alt="" />
+ </p>
+
+ <p>
+ Unscrew those:<br/>
+ <img src="../images/t60_dev/0020.JPG" alt="" />
+ </p>
+
+ <p>
+ Make sure you removed those:<br/>
+ <img src="../images/t60_dev/0021.JPG" alt="" />
+ </p>
+
+ <p>
+ Disconnect LCD cable from board:<br/>
+ <img src="../images/t60_dev/0022.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove those screws then remove the LCD assembly:<br/>
+ <img src="../images/t60_dev/0023.JPG" alt="" /> <img src="../images/t60_dev/0024.JPG" alt="" /> <img src="../images/t60_dev/0025.JPG" alt="" />
+ </p>
+
+ <p>
+ Once again, make sure you removed those:<br/>
+ <img src="../images/t60_dev/0026.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove the shielding containing the motherboard, then flip it over. Remove these screws, placing them on a steady
+ surface in the same layout as they were in before you removed them. Also, you should mark each screw hole after removing the
+ screw (a permanent marker pen will do), this is so that you have a point of reference when re-assembling the machine:<br/>
+ <img src="../images/t60_dev/0027.JPG" alt="" /> <img src="../images/t60_dev/0028.JPG" alt="" /> <img src="../images/t60_dev/0029.JPG" alt="" />
+ <img src="../images/t60_dev/0031.JPG" alt="" /> <img src="../images/t60_dev/0032.JPG" alt="" /> <img src="../images/t60_dev/0033.JPG" alt="" />
+ </p>
+
+ <p>
+ Now wire up the BBB and the Pomona with your PSU.<br/>
+ Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
+ the BBB for flashing.<br/>
+ <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the T60:
+ if you don't have or don't want to use an external PSU, then make
+ sure not to connect the red/black 3.3v leads mentioned in the guide;
+ instead, connect the AC adapter (the one that normally charges your
+ battery) so that the board has power (but don't boot it up)</b><br/>
+ <img src="../images/t60_dev/0030.JPG" alt="" /><br/>
+ Correlate the following with the BBB guide linked above:
+ </p>
<pre>
POMONA 5250:
=== DVD drive ====
@@ -179,98 +184,102 @@ POMONA 5250:
<i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i>
</pre>
- <p>
- Connect the pomona from the BBB to the flash chip. No pics unfortunately. (use the text diagram above).
- </p>
-
- <p>
- SSH'd into the BBB:<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
- </p>
- <p>
- It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
- definitions detected, then choose one of them following the instructions in the output.
- </p>
-
- <p>
- Put those screws back:<br/>
- <img src="../images/t60_dev/0047.JPG" alt="" />
- </p>
-
- <p>
- Put it back into lower chassis:<br/>
- <img src="../images/t60_dev/0048.JPG" alt="" />
- </p>
-
- <p>
- Attach LCD and insert screws (also, attach the lcd cable to the board):<br/>
- <img src="../images/t60_dev/0049.JPG" alt="" />
- </p>
-
- <p>
- Insert those screws:<br/>
- <img src="../images/t60_dev/0050.JPG" alt="" />
- </p>
-
- <p>
- On the CPU (and there is another chip south-east to it, sorry forgot to take pic)
- clean off the old thermal paste (with the alcohol) and apply new (Artic Silver 5 is good, others are good too)
- you should also clean the heatsink the same way<br/>
- <img src="../images/t60_dev/0051.JPG" alt="" />
- </p>
-
- <p>
- Attach the heatsink and install the screws (also, make sure to install the AC jack as highlighted):<br/>
- <img src="../images/t60_dev/0052.JPG" alt="" />
+ <p>
+ Connect the pomona from the BBB to the flash chip. No pics unfortunately. (use the text diagram above).
+ </p>
+
+ <p>
+ SSH'd into the BBB:<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
+ </p>
+ <p>
+ It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
+ definitions detected, then choose one of them following the instructions in the output.
+ </p>
+
+ <p>
+ Put those screws back:<br/>
+ <img src="../images/t60_dev/0047.JPG" alt="" />
+ </p>
+
+ <p>
+ Put it back into lower chassis:<br/>
+ <img src="../images/t60_dev/0048.JPG" alt="" />
+ </p>
+
+ <p>
+ Attach LCD and insert screws (also, attach the lcd cable to the board):<br/>
+ <img src="../images/t60_dev/0049.JPG" alt="" />
+ </p>
+
+ <p>
+ Insert those screws:<br/>
+ <img src="../images/t60_dev/0050.JPG" alt="" />
+ </p>
+
+ <p>
+ On the CPU (and there is another chip south-east to it, sorry forgot to take pic)
+ clean off the old thermal paste (with the alcohol) and apply new (Artic Silver 5 is good, others are good too)
+ you should also clean the heatsink the same way<br/>
+ <img src="../images/t60_dev/0051.JPG" alt="" />
+ </p>
+
+ <p>
+ Attach the heatsink and install the screws (also, make sure to install the AC jack as highlighted):<br/>
+ <img src="../images/t60_dev/0052.JPG" alt="" />
+ </p>
+
+ <p>
+ Reinstall that upper bezel:<br/>
+ <img src="../images/t60_dev/0053.JPG" alt="" />
+ </p>
+
+ <p>
+ Do that:<br/>
+ <img src="../images/t60_dev/0054.JPG" alt="" /> <img src="../images/t60_dev/0055.JPG" alt="" />
+ </p>
+
+ <p>
+ Re-attach modem, wifi, (wwan?), and all necessary cables. Sorry, forgot to take pics. Look at previous removal steps to see where they go back to.
+ </p>
+
+ <p>
+ Attach keyboard and install nvram battery:<br/>
+ <img src="../images/t60_dev/0056.JPG" alt="" /> <img src="../images/t60_dev/0057.JPG" alt="" />
+ </p>
+
+ <p>
+ Place keyboard and (sorry, forgot to take pics) reinstall the palmrest and insert screws on the underside:<br/>
+ <img src="../images/t60_dev/0058.JPG" alt="" />
+ </p>
+
+ <p>
+ It lives!<br/>
+ <img src="../images/t60_dev/0071.JPG" alt="" /> <img src="../images/t60_dev/0072.JPG" alt="" /> <img src="../images/t60_dev/0073.JPG" alt="" />
+ </p>
+
+ <p>
+ Always stress test ('stress -c 2' and xsensors. below 90C is ok) when replacing cpu paste/heatsink:<br/>
+ <img src="../images/t60_dev/0074.JPG" alt="" />
+ </p>
+
+ </div>
+
+ <div class="section">
+
+ <p>
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+ </p>
+
+ <p>
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
</p>
-
- <p>
- Reinstall that upper bezel:<br/>
- <img src="../images/t60_dev/0053.JPG" alt="" />
- </p>
-
- <p>
- Do that:<br/>
- <img src="../images/t60_dev/0054.JPG" alt="" /> <img src="../images/t60_dev/0055.JPG" alt="" />
- </p>
-
- <p>
- Re-attach modem, wifi, (wwan?), and all necessary cables. Sorry, forgot to take pics. Look at previous removal steps to see where they go back to.
- </p>
-
- <p>
- Attach keyboard and install nvram battery:<br/>
- <img src="../images/t60_dev/0056.JPG" alt="" /> <img src="../images/t60_dev/0057.JPG" alt="" />
- </p>
-
- <p>
- Place keyboard and (sorry, forgot to take pics) reinstall the palmrest and insert screws on the underside:<br/>
- <img src="../images/t60_dev/0058.JPG" alt="" />
- </p>
-
- <p>
- It lives!<br/>
- <img src="../images/t60_dev/0071.JPG" alt="" /> <img src="../images/t60_dev/0072.JPG" alt="" /> <img src="../images/t60_dev/0073.JPG" alt="" />
- </p>
-
- <p>
- Always stress test ('stress -c 2' and xsensors. below 90C is ok) when replacing cpu paste/heatsink:<br/>
- <img src="../images/t60_dev/0074.JPG" alt="" />
- </p>
-
-<hr/>
-
- <p>
- Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
-
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+
+ </div>
</body>
</html>
diff --git a/docs/install/x200_external.html b/docs/install/x200_external.html
index 84bf2ed..66f938f 100644
--- a/docs/install/x200_external.html
+++ b/docs/install/x200_external.html
@@ -13,62 +13,61 @@
<body>
- <header>
+ <div class="section">
<h1 id="pagetop">Flashing the X200 with a BeagleBone Black</h1>
- <aside>Initial flashing instructions for X200.</aside>
- </header>
-
- <p>
- This guide is for those who want libreboot on their ThinkPad X200
- while they still have the original Lenovo BIOS present. This guide
- can also be followed (adapted) if you brick your X200, to know how
- to recover.
- </p>
-
- <p>
- The X200S is also briefly covered (image showing soldering joints, wired up
- to a BBB). Note, not all X200S or X200 Tablet configurations are supported yet
- (see <a href="../hcl/x200.html#x200s">../hcl/x200.html#x200s</a></b>
- </p>
-
- <p>
- Before following this section, please make sure to setup your libreboot ROM properly first.
- Although ROM images are provided pre-built in libreboot, there are some modifications that
- you need to make to the one you chose before flashing. (instructions referenced later in
- this guide)
- </p>
+ <p>Initial flashing instructions for X200.</p>
+ <p>
+ This guide is for those who want libreboot on their ThinkPad X200
+ while they still have the original Lenovo BIOS present. This guide
+ can also be followed (adapted) if you brick your X200, to know how
+ to recover.
+ </p>
+ <p>
+ The X200S is also briefly covered (image showing soldering joints, wired up
+ to a BBB). Note, not all X200S or X200 Tablet configurations are supported yet
+ (see <a href="../hcl/x200.html#x200s">../hcl/x200.html#x200s</a></b>
+ </p>
+ <p>
+ Before following this section, please make sure to setup your libreboot ROM properly first.
+ Although ROM images are provided pre-built in libreboot, there are some modifications that
+ you need to make to the one you chose before flashing. (instructions referenced later in
+ this guide)
+ </p>
- <p>Or go <a href="index.html">back to main index</a></p>
+ <p><a href="index.html">Back to main index</a></p>
+ </div>
-<hr/>
+ <div class="section">
- <h1 id="flashchips">Flash chips</h1>
-
- <p>
- There are two possible flash chip sizes for the X200: 4MiB
- (32Mbit) or 8MiB (64Mbit). This can be identified by the type
- of flash chip below the palmrest: 4MiB is SOIC-8 (8 pins), 8MiB
- is SOIC-16 (16 pins). The X200S uses a WSON package and has the same
- pinout as SOIC-8 (covered briefly later on in this guide) but
- the chip is on the underside of the board (disassembly required).
- </p>
-
- <p>
- <a href="#pagetop">Back to top of page.</a>
- </p>
+ <h1 id="flashchips">Flash chips</h1>
+
+ <p>
+ There are two possible flash chip sizes for the X200: 4MiB
+ (32Mbit) or 8MiB (64Mbit). This can be identified by the type
+ of flash chip below the palmrest: 4MiB is SOIC-8 (8 pins), 8MiB
+ is SOIC-16 (16 pins). The X200S uses a WSON package and has the same
+ pinout as SOIC-8 (covered briefly later on in this guide) but
+ the chip is on the underside of the board (disassembly required).
+ </p>
-<hr/>
+ <p>
+ <a href="#pagetop">Back to top of page.</a>
+ </p>
+
+ </div>
+
+ <div class="section">
- <h1>Initial BBB setup</h1>
-
- <p>
- Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to
- setup the BBB for flashing.
- </p>
+ <h1>Initial BBB setup</h1>
+
+ <p>
+ Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to
+ setup the BBB for flashing.
+ </p>
- <p>
- The following shows how to connect clip to the BBB (on the P9 header), for SOIC-16 (clip: Pomona 5252):
- </p>
+ <p>
+ The following shows how to connect clip to the BBB (on the P9 header), for SOIC-16 (clip: Pomona 5252):
+ </p>
<pre>
POMONA 5252 (correlate with the BBB guide)
=== front (display) on your X200 ====
@@ -83,9 +82,9 @@ POMONA 5252 (correlate with the BBB guide)
=== back (palmrest) on your X200 ===
<i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i>
</pre>
- <p>
- The following shows how to connect clip to the BBB (on the P9 header), for SOIC-8 (clip: Pomona 5250):
- </p>
+ <p>
+ The following shows how to connect clip to the BBB (on the P9 header), for SOIC-8 (clip: Pomona 5250):
+ </p>
<pre>
POMONA 5250 (correlate with the BBB guide)
=== front (display) on your X200 ====
@@ -96,34 +95,34 @@ POMONA 5250 (correlate with the BBB guide)
=== back (palmrest) on your X200 ===
<i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i>
</pre>
- <p>
- <b>On the X200S the flash chip is underneath the board, in a WSON package.
- The pinout is very much the same as a SOIC-8, except you need to solder (there are no clips available).
- <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>
- </p>
-
- <h2>
- Connect Pomona 5252/5250 to the X200 flash chip, and dump/flash
- </h2>
- <p>
- <a href="images/x200/x200_pomona.jpg">images/x200/x200_pomona.jpg</a>
- shows everything connected. In this picture, the X200 is being flashed
- with the BBB.
- </p>
<p>
- Remove the battery from your X200, then remove all the screws on
- the bottom (underside) of the machine. Then remove the keyboard and palmrest.
- The flash chip is below the palm rest. Lift back the tape that goes over it,
- and then connect your 5252/5250 (make sure to get it the right way round).
- Then connect the 3.3v PSU wire (red one) and make sure that everything else is connected.
- </p>
- <p>
- I did (SSH'd into the BBB):<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512</b><br/>
- In my case, the output was:
+ <b>On the X200S the flash chip is underneath the board, in a WSON package.
+ The pinout is very much the same as a SOIC-8, except you need to solder (there are no clips available).
+ <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>
</p>
+
+ <h2>
+ Connect Pomona 5252/5250 to the X200 flash chip, and dump/flash
+ </h2>
+ <p>
+ <a href="images/x200/x200_pomona.jpg">images/x200/x200_pomona.jpg</a>
+ shows everything connected. In this picture, the X200 is being flashed
+ with the BBB.
+ </p>
+ <p>
+ Remove the battery from your X200, then remove all the screws on
+ the bottom (underside) of the machine. Then remove the keyboard and palmrest.
+ The flash chip is below the palm rest. Lift back the tape that goes over it,
+ and then connect your 5252/5250 (make sure to get it the right way round).
+ Then connect the 3.3v PSU wire (red one) and make sure that everything else is connected.
+ </p>
+ <p>
+ I did (SSH'd into the BBB):<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512</b><br/>
+ In my case, the output was:
+ </p>
<pre>
flashrom v0.9.7-r1854 on Linux 3.8.13-bone47 (armv7l)
flashrom is free software, get the source code at http://www.flashrom.org
@@ -134,48 +133,48 @@ Found Macronix flash chip &quot;MX25L6445E/MX25L6473E&quot; (8192 kB, SPI) on li
Multiple flash chip definitions match the detected chip(s): &quot;MX25L6405(D)&quot;, &quot;MX25L6406E/MX25L6436E&quot;, &quot;MX25L6445E/MX25L6473E&quot;
Please specify which chip definition to use with the -c &lt;chipname&gt; option.
</pre>
- <p>
- This is just to test that it's working. In my case, I had to define which chip to use, like so (in your case
- it may be different, depending on what flash chip you have):<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot;</b>
- </p>
- <p>
- At this point, you need to create a copy of the original lenovo firmware that is currently flashed.
- This is so that you can extract the gbe (gigabit ethernet) and flash descriptor regions for use in libreboot. <b>These
- are not blobs, they only contain non-functional data (configuration details, fully readable) which is fully documented in public datasheets.</b>
- The descriptor will need to be modified
- to disable the ME (also disable AMT) so that you can flash a ROM that excludes it.
- </p>
- <p>
- How to backup factory.rom (change the -c option as neeed, for your flash chip):<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory.rom</b><br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory1.rom</b><br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory2.rom</b><br/>
- Now compare the 3 images:<br/>
- # <b>sha512sum factory*.rom</b><br/>
- If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another machine, not
- the BBB). You will need it later for part of the deblobbing.
- </p>
- <p>
- Information about the descriptor, gbe regions and how the ME was removed can be found in the notes linked at
- <a href="../hcl/x200_remove_me.html">../hcl/x200_remove_me.html</a>. Libreboot ROM images now include
- the 12KiB descriptor+gbe by default, generated using ich9gen;
- <b>however, do note that the MAC address in the Gbe region is generic. Follow the instructions at
- <a href="../hcl/x200_remove_me.html#ich9gen">../hcl/x200_remove_me.html#ich9gen</a> and do what it says to change the MAC address
- inside your X200 ROM image, before flashing it.</b>
- </p>
- <p>
- Assuming that your libreboot ROM image is properly setup (modified descriptor plus gbe region included in the ROM),
- then you can flash (assuming that the filename is <b>libreboot.rom</b>) for example I had to do:<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -w libreboot.rom</b>
- </p>
- <p>
- You might see errors, but if it says <b>Verifying flash... VERIFIED</b> at the end, then it's flashed and should boot.
- Test it! (boot your X200)
- </p>
- <p>
- My output when running the command above:
- </p>
+ <p>
+ This is just to test that it's working. In my case, I had to define which chip to use, like so (in your case
+ it may be different, depending on what flash chip you have):<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot;</b>
+ </p>
+ <p>
+ At this point, you need to create a copy of the original lenovo firmware that is currently flashed.
+ This is so that you can extract the gbe (gigabit ethernet) and flash descriptor regions for use in libreboot. <b>These
+ are not blobs, they only contain non-functional data (configuration details, fully readable) which is fully documented in public datasheets.</b>
+ The descriptor will need to be modified
+ to disable the ME (also disable AMT) so that you can flash a ROM that excludes it.
+ </p>
+ <p>
+ How to backup factory.rom (change the -c option as neeed, for your flash chip):<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory.rom</b><br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory1.rom</b><br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -r factory2.rom</b><br/>
+ Now compare the 3 images:<br/>
+ # <b>sha512sum factory*.rom</b><br/>
+ If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another machine, not
+ the BBB). You will need it later for part of the deblobbing.
+ </p>
+ <p>
+ Information about the descriptor, gbe regions and how the ME was removed can be found in the notes linked at
+ <a href="../hcl/x200_remove_me.html">../hcl/x200_remove_me.html</a>. Libreboot ROM images now include
+ the 12KiB descriptor+gbe by default, generated using ich9gen;
+ <b>however, do note that the MAC address in the Gbe region is generic. Follow the instructions at
+ <a href="../hcl/x200_remove_me.html#ich9gen">../hcl/x200_remove_me.html#ich9gen</a> and do what it says to change the MAC address
+ inside your X200 ROM image, before flashing it.</b>
+ </p>
+ <p>
+ Assuming that your libreboot ROM image is properly setup (modified descriptor plus gbe region included in the ROM),
+ then you can flash (assuming that the filename is <b>libreboot.rom</b>) for example I had to do:<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -c &quot;MX25L6405(D)&quot; -w libreboot.rom</b>
+ </p>
+ <p>
+ You might see errors, but if it says <b>Verifying flash... VERIFIED</b> at the end, then it's flashed and should boot.
+ Test it! (boot your X200)
+ </p>
+ <p>
+ My output when running the command above:
+ </p>
<pre>
flashrom v0.9.7-r1854 on Linux 3.8.13-bone47 (armv7l)
flashrom is free software, get the source code at http://www.flashrom.org
@@ -188,24 +187,28 @@ Reading current flash chip contents... done. Looking for another erase function.
Erase/write done.
Verifying flash... VERIFIED.
</pre>
+
+ <p>
+ <a href="#pagetop">Back to top of page.</a>
+ </p>
- <p>
- <a href="#pagetop">Back to top of page.</a>
- </p>
+ </div>
-<hr/>
+ <div class="section">
- <p>
- Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
+ <p>
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+ </p>
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+ <p>
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
+ </p>
+
+ </div>
</body>
</html>
diff --git a/docs/install/x60_unbrick.html b/docs/install/x60_unbrick.html
index 89edfb4..1b5056d 100644
--- a/docs/install/x60_unbrick.html
+++ b/docs/install/x60_unbrick.html
@@ -13,123 +13,128 @@
<body>
- <header>
+ <div class="section">
<h1>Unbricking the ThinkPad X60</h1>
- <aside>This guide will show you how to recover from a bad flash that prevents your ThinkPad X60 from booting.</aside>
- </header>
+ <p>This guide will show you how to recover from a bad flash that prevents your ThinkPad X60 from booting.</p>
+ <p><a href="index.html">Back to previous index</a></p>
+ </div>
- <p>Or go <a href="index.html">back to main index</a></p>
+ <div class="section">
+ <h1>Table of Contents</h1>
+ <ul>
+ <li>
+ Types of brick:
+ <ul>
+ <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
+ <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
- <h2>Table of Contents</h2>
- <ul>
- <li>
- Types of brick:
- <ul>
- <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
- <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
- </ul>
- </li>
- </ul>
+ <div class="section">
+ <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
+ <p>
+ You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
+ the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
- <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
- <p>
- You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
- the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
-
- In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
- <img src="../images/x60_unbrick/0004.jpg" alt="" /><br/><br/>
+ In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
+ <img src="../images/x60_unbrick/0004.jpg" alt="" /><br/><br/>
- *Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
- dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
- dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
- dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
- (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
- using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
- </p>
+ *Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
+ dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
+ dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
+ dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
+ (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
+ using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
+ </p>
+ </div>
+
+ <div class="section">
- <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
- <p>
- In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
- booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
- </p>
- <p>
- &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
- </p>
- <p>
- Remove those screws:<br/>
- <img src="../images/x60_unbrick/0000.jpg" alt="" />
- </p>
- <p>
- Push the keyboard forward (carefully):<br/>
- <img src="../images/x60_unbrick/0001.jpg" alt="" />
- </p>
- <p>
- Lift the keyboard up and disconnect it from the board:<br/>
- <img src="../images/x60_unbrick/0002.jpg" alt="" />
- </p>
- <p>
- Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:<br/>
- <img src="../images/x60_unbrick/0003.jpg" alt="" />
- </p>
- <p>
- You should now have this:<br/>
- <img src="../images/x60_unbrick/0004.jpg" alt="" />
- </p>
- <p>
- Disconnect the wifi antenna cables, the modem cable and the speaker:<br/>
- <img src="../images/x60_unbrick/0005.jpg" alt="" />
- </p>
- <p>
- Unroute the cables along their path, carefully lifting the tape that holds them in place. Then, disconnect the modem
- cable (other end) and power connection and unroute all the cables so that they dangle by the monitor hinge on the right-hand
- side:<br/>
- <img src="../images/x60_unbrick/0006.jpg" alt="" />
- </p>
- <p>
- Disconnect the monitor from the motherboard, and unroute the grey antenna cable, carefully lifting the tape
- that holds it into place:<br/>
- <img src="../images/x60_unbrick/0008.jpg" alt="" />
- </p>
- <p>
- Carefully lift the remaining tape and unroute the left antenna cable so that it is loose:<br/>
- <img src="../images/x60_unbrick/0009.jpg" alt="" />
- </p>
- <p>
- Remove the screw that is highlighted (do NOT remove the other one; it holds part of the heatsink (other side) into place):<br/>
- <img src="../images/x60_unbrick/0011.jpg" alt="" />
- </p>
- <p>
- Remove those screws:<br/>
- <img src="../images/x60_unbrick/0012.jpg" alt="" />
- </p>
- <p>
- Carefully remove the plate, like so:<br/>
- <img src="../images/x60_unbrick/0013.jpg" alt="" />
- </p>
- <p>
- Remove the SATA connector:<br/>
- <img src="../images/x60_unbrick/0014.jpg" alt="" />
- </p>
- <p>
- Now remove the motherboard (gently) and cast the lcd/chassis aside:<br/>
- <img src="../images/x60_unbrick/0015.jpg" alt="" />
- </p>
- <p>
- Lift back that tape and hold it with something. Highlighted is the SPI flash chip:<br/>
- <img src="../images/x60_unbrick/0016.jpg" alt="" />
- </p>
- <p>
- Now wire up the BBB and the Pomona with your PSU.<br/>
- Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
- the BBB for flashing.<br/>
- <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the X60:
- if you don't have or don't want to use an external PSU, then make
- sure not to connect the red/black 3.3v leads mentioned in the guide;
- instead, connect the AC adapter (the one that normally charges your
- battery) so that the board has power (but don't boot it up)</b>
- <img src="../images/x60_unbrick/0017.jpg" alt="" /><br/>
- Correlate the following with the BBB guide linked above:
- </p>
+ <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
+ <p>
+ In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
+ booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
+ </p>
+ <p>
+ &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
+ </p>
+ <p>
+ Remove those screws:<br/>
+ <img src="../images/x60_unbrick/0000.jpg" alt="" />
+ </p>
+ <p>
+ Push the keyboard forward (carefully):<br/>
+ <img src="../images/x60_unbrick/0001.jpg" alt="" />
+ </p>
+ <p>
+ Lift the keyboard up and disconnect it from the board:<br/>
+ <img src="../images/x60_unbrick/0002.jpg" alt="" />
+ </p>
+ <p>
+ Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:<br/>
+ <img src="../images/x60_unbrick/0003.jpg" alt="" />
+ </p>
+ <p>
+ You should now have this:<br/>
+ <img src="../images/x60_unbrick/0004.jpg" alt="" />
+ </p>
+ <p>
+ Disconnect the wifi antenna cables, the modem cable and the speaker:<br/>
+ <img src="../images/x60_unbrick/0005.jpg" alt="" />
+ </p>
+ <p>
+ Unroute the cables along their path, carefully lifting the tape that holds them in place. Then, disconnect the modem
+ cable (other end) and power connection and unroute all the cables so that they dangle by the monitor hinge on the right-hand
+ side:<br/>
+ <img src="../images/x60_unbrick/0006.jpg" alt="" />
+ </p>
+ <p>
+ Disconnect the monitor from the motherboard, and unroute the grey antenna cable, carefully lifting the tape
+ that holds it into place:<br/>
+ <img src="../images/x60_unbrick/0008.jpg" alt="" />
+ </p>
+ <p>
+ Carefully lift the remaining tape and unroute the left antenna cable so that it is loose:<br/>
+ <img src="../images/x60_unbrick/0009.jpg" alt="" />
+ </p>
+ <p>
+ Remove the screw that is highlighted (do NOT remove the other one; it holds part of the heatsink (other side) into place):<br/>
+ <img src="../images/x60_unbrick/0011.jpg" alt="" />
+ </p>
+ <p>
+ Remove those screws:<br/>
+ <img src="../images/x60_unbrick/0012.jpg" alt="" />
+ </p>
+ <p>
+ Carefully remove the plate, like so:<br/>
+ <img src="../images/x60_unbrick/0013.jpg" alt="" />
+ </p>
+ <p>
+ Remove the SATA connector:<br/>
+ <img src="../images/x60_unbrick/0014.jpg" alt="" />
+ </p>
+ <p>
+ Now remove the motherboard (gently) and cast the lcd/chassis aside:<br/>
+ <img src="../images/x60_unbrick/0015.jpg" alt="" />
+ </p>
+ <p>
+ Lift back that tape and hold it with something. Highlighted is the SPI flash chip:<br/>
+ <img src="../images/x60_unbrick/0016.jpg" alt="" />
+ </p>
+ <p>
+ Now wire up the BBB and the Pomona with your PSU.<br/>
+ Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
+ the BBB for flashing.<br/>
+ <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the X60:
+ if you don't have or don't want to use an external PSU, then make
+ sure not to connect the red/black 3.3v leads mentioned in the guide;
+ instead, connect the AC adapter (the one that normally charges your
+ battery) so that the board has power (but don't boot it up)</b>
+ <img src="../images/x60_unbrick/0017.jpg" alt="" /><br/>
+ Correlate the following with the BBB guide linked above:
+ </p>
<pre>
POMONA 5250:
=== golden finger and wifi switch ====
@@ -141,132 +146,136 @@ POMONA 5250:
<i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i>
</pre>
- <p>
- Connecting the BBB and pomona (in this image, an external 3.3v DC PSU was used):<br/>
- <img src="images/x60/th_bbb_flashing.jpg" alt="" />
- </p>
+ <p>
+ Connecting the BBB and pomona (in this image, an external 3.3v DC PSU was used):<br/>
+ <img src="images/x60/th_bbb_flashing.jpg" alt="" />
+ </p>
- <p>
- SSH'd into the BBB:<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
- </p>
- <p>
- It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
- definitions detected, then choose one of them following the instructions in the output.
- </p>
+ <p>
+ SSH'd into the BBB:<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
+ </p>
+ <p>
+ It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
+ definitions detected, then choose one of them following the instructions in the output.
+ </p>
+
+ <p>
+ Remove the programmer and put it away somewhere. Put back the tape and press firmly over it:<br/>
+ <img src="../images/x60_unbrick/0026.jpg" alt="" />
+ </p>
+ <p>
+ Your empty chassis:<br/>
+ <img src="../images/x60_unbrick/0027.jpg" alt="" />
+ </p>
+ <p>
+ Put the motherboard back in:<br/>
+ <img src="../images/x60_unbrick/0028.jpg" alt="" />
+ </p>
+ <p>
+ Reconnect SATA:<br/>
+ <img src="../images/x60_unbrick/0029.jpg" alt="" />
+ </p>
+ <p>
+ Put the plate back and re-insert those screws:<br/>
+ <img src="../images/x60_unbrick/0030.jpg" alt="" />
+ </p>
+ <p>
+ Re-route that antenna cable around the fan and apply the tape:<br/>
+ <img src="../images/x60_unbrick/0031.jpg" alt="" />
+ </p>
+ <p>
+ Route the cable here and then (not shown, due to error on my part) reconnect the monitor cable to the motherboard
+ and re-insert the screws:<br/>
+ <img src="../images/x60_unbrick/0032.jpg" alt="" />
+ </p>
+ <p>
+ Re-insert that screw:<br/>
+ <img src="../images/x60_unbrick/0033.jpg" alt="" />
+ </p>
+ <p>
+ Route the black antenna cable like so:<br/>
+ <img src="../images/x60_unbrick/0034.jpg" alt="" />
+ </p>
+ <p>
+ Tuck it in neatly like so:<br/>
+ <img src="../images/x60_unbrick/0035.jpg" alt="" />
+ </p>
+ <p>
+ Route the modem cable like so:<br/>
+ <img src="../images/x60_unbrick/0036.jpg" alt="" />
+ </p>
+ <p>
+ Connect modem cable to board and tuck it in neatly like so:<br/>
+ <img src="../images/x60_unbrick/0037.jpg" alt="" />
+ </p>
+ <p>
+ Route the power connection and connect it to the board like so:<br/>
+ <img src="../images/x60_unbrick/0038.jpg" alt="" />
+ </p>
+ <p>
+ Route the antenna and modem cables neatly like so:<br/>
+ <img src="../images/x60_unbrick/0039.jpg" alt="" />
+ </p>
+ <p>
+ Connect the wifi antenna cables. At the start of the tutorial, this machine had an Intel wifi chip. Here you see I've replaced it with an
+ Atheros AR5B95 (supports 802.11n and can be used without blobs):<br/>
+ <img src="../images/x60_unbrick/0040.jpg" alt="" />
+ </p>
+ <p>
+ Connect the modem cable:<br/>
+ <img src="../images/x60_unbrick/0041.jpg" alt="" />
+ </p>
+ <p>
+ Connect the speaker:<br/>
+ <img src="../images/x60_unbrick/0042.jpg" alt="" />
+ </p>
+ <p>
+ You should now have this:<br/>
+ <img src="../images/x60_unbrick/0043.jpg" alt="" />
+ </p>
+ <p>
+ Re-connect the upper chassis:<br/>
+ <img src="../images/x60_unbrick/0044.jpg" alt="" />
+ </p>
+ <p>
+ Re-connect the keyboard:<br/>
+ <img src="../images/x60_unbrick/0045.jpg" alt="" />
+ </p>
+ <p>
+ Re-insert the screws that you removed earlier:<br/>
+ <img src="../images/x60_unbrick/0046.jpg" alt="" />
+ </p>
+ <p>
+ Power on!<br/>
+ <img src="../images/x60_unbrick/0047.jpg" alt="" />
+ </p>
+ <p>
+ Trisquel live USB menu (using the GRUB ISOLINUX parser):<br/>
+ <img src="../images/x60_unbrick/0048.jpg" alt="" />
+ </p>
+ <p>
+ Trisquel live desktop:<br/>
+ <img src="../images/x60_unbrick/0049.jpg" alt="" />
+ </p>
+
+ </div>
+
+ <div class="section">
<p>
- Remove the programmer and put it away somewhere. Put back the tape and press firmly over it:<br/>
- <img src="../images/x60_unbrick/0026.jpg" alt="" />
- </p>
- <p>
- Your empty chassis:<br/>
- <img src="../images/x60_unbrick/0027.jpg" alt="" />
- </p>
- <p>
- Put the motherboard back in:<br/>
- <img src="../images/x60_unbrick/0028.jpg" alt="" />
- </p>
- <p>
- Reconnect SATA:<br/>
- <img src="../images/x60_unbrick/0029.jpg" alt="" />
- </p>
- <p>
- Put the plate back and re-insert those screws:<br/>
- <img src="../images/x60_unbrick/0030.jpg" alt="" />
- </p>
- <p>
- Re-route that antenna cable around the fan and apply the tape:<br/>
- <img src="../images/x60_unbrick/0031.jpg" alt="" />
- </p>
- <p>
- Route the cable here and then (not shown, due to error on my part) reconnect the monitor cable to the motherboard
- and re-insert the screws:<br/>
- <img src="../images/x60_unbrick/0032.jpg" alt="" />
- </p>
- <p>
- Re-insert that screw:<br/>
- <img src="../images/x60_unbrick/0033.jpg" alt="" />
- </p>
- <p>
- Route the black antenna cable like so:<br/>
- <img src="../images/x60_unbrick/0034.jpg" alt="" />
- </p>
- <p>
- Tuck it in neatly like so:<br/>
- <img src="../images/x60_unbrick/0035.jpg" alt="" />
- </p>
- <p>
- Route the modem cable like so:<br/>
- <img src="../images/x60_unbrick/0036.jpg" alt="" />
- </p>
- <p>
- Connect modem cable to board and tuck it in neatly like so:<br/>
- <img src="../images/x60_unbrick/0037.jpg" alt="" />
- </p>
- <p>
- Route the power connection and connect it to the board like so:<br/>
- <img src="../images/x60_unbrick/0038.jpg" alt="" />
- </p>
- <p>
- Route the antenna and modem cables neatly like so:<br/>
- <img src="../images/x60_unbrick/0039.jpg" alt="" />
- </p>
- <p>
- Connect the wifi antenna cables. At the start of the tutorial, this machine had an Intel wifi chip. Here you see I've replaced it with an
- Atheros AR5B95 (supports 802.11n and can be used without blobs):<br/>
- <img src="../images/x60_unbrick/0040.jpg" alt="" />
- </p>
- <p>
- Connect the modem cable:<br/>
- <img src="../images/x60_unbrick/0041.jpg" alt="" />
- </p>
- <p>
- Connect the speaker:<br/>
- <img src="../images/x60_unbrick/0042.jpg" alt="" />
- </p>
- <p>
- You should now have this:<br/>
- <img src="../images/x60_unbrick/0043.jpg" alt="" />
- </p>
- <p>
- Re-connect the upper chassis:<br/>
- <img src="../images/x60_unbrick/0044.jpg" alt="" />
- </p>
- <p>
- Re-connect the keyboard:<br/>
- <img src="../images/x60_unbrick/0045.jpg" alt="" />
- </p>
- <p>
- Re-insert the screws that you removed earlier:<br/>
- <img src="../images/x60_unbrick/0046.jpg" alt="" />
- </p>
- <p>
- Power on!<br/>
- <img src="../images/x60_unbrick/0047.jpg" alt="" />
- </p>
- <p>
- Trisquel live USB menu (using the GRUB ISOLINUX parser):<br/>
- <img src="../images/x60_unbrick/0048.jpg" alt="" />
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
</p>
+
<p>
- Trisquel live desktop:<br/>
- <img src="../images/x60_unbrick/0049.jpg" alt="" />
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
</p>
-
-<hr/>
-
- <p>
- Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
-
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+
+ </div>
</body>
</html>
diff --git a/docs/install/x60tablet_unbrick.html b/docs/install/x60tablet_unbrick.html
index 0510867..3623482 100644
--- a/docs/install/x60tablet_unbrick.html
+++ b/docs/install/x60tablet_unbrick.html
@@ -8,120 +8,125 @@
@import url('../css/main.css');
</style>
- <title>Libreboot documentation: Unbricking the ThinkPad X60 Tablet</title>
+ <title>Unbricking the ThinkPad X60 Tablet</title>
</head>
<body>
- <header>
- <h1>Unbricking the ThinkPad X60</h1>
- <aside>This guide will show you how to recover from a bad flash that prevents your ThinkPad X60 Tablet from booting.</aside>
- </header>
-
- <p>Or go <a href="index.html">back to main index</a></p>
-
- <h2>Table of Contents</h2>
- <ul>
- <li>
- Types of brick:
- <ul>
- <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
- <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
- </ul>
- </li>
- </ul>
-
- <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
- <p>
- You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
- the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
-
- In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
- <img src="../images/x60t_unbrick/0008.JPG" alt="" /><br/><br/>
-
- *Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
- dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
- dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
- dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
- (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
- using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
- </p>
-
- <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
- <p>
- In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
- booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
- </p>
- <p>
- &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
- </p>
-
- <p>
- <img src="../images/x60t_unbrick/0000.JPG" alt="" />
- </p>
-
- <p>
- Remove those screws:<br/>
- <img src="../images/x60t_unbrick/0001.JPG" alt="" />
- </p>
-
- <p>
- Remove the HDD:<br/>
- <img src="../images/x60t_unbrick/0002.JPG" alt="" />
- </p>
-
- <p>
- Push keyboard forward to loosen it:<br/>
- <img src="../images/x60t_unbrick/0003.JPG" alt="" />
- </p>
-
- <p>
- Lift:<br/>
- <img src="../images/x60t_unbrick/0004.JPG" alt="" />
- </p>
-
- <p>
- Remove those:<br/>
- <img src="../images/x60t_unbrick/0005.JPG" alt="" />
- </p>
-
- <p>
+ <div class="section">
+ <h1>Unbricking the ThinkPad X60 Tablet</h1>
+ <p>This guide will show you how to recover from a bad flash that prevents your ThinkPad X60 Tablet from booting.</p>
+ <p><a href="index.html">Back to previous index</a></p>
+ </div>
+
+ <div class="section">
+ <h2>Table of Contents</h2>
+ <ul>
+ <li>
+ Types of brick:
+ <ul>
+ <li><a href="#bucts_brick">Brick type 1: bucts not reset</a></li>
+ <li><a href="#recovery">Brick type 2: bad rom (or user error), machine won't boot</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+
+ <div class="section">
+ <h1 id="bucts_brick">Brick type 1: bucts not reset.</h1>
+ <p>
+ You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and
+ the ROM wasn't dd'd.* or if Lenovo BIOS was present and libreboot wasn't flashed.<br/><br/>
+
+ In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:<br/>
+ <img src="../images/x60t_unbrick/0008.JPG" alt="" /><br/><br/>
+
+ *Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):<br/>
+ dd if=coreboot.rom of=top64k.bin bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x10000] count=64k<br/>
+ dd if=coreboot.rom bs=1 skip=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k | hexdump<br/>
+ dd if=top64k.bin of=coreboot.rom bs=1 seek=$[$(stat -c %s coreboot.rom) - 0x20000] count=64k conv=notrunc<br/>
+ (doing this makes the ROM suitable for use when flashing a machine that still has Lenovo BIOS running,
+ using those instructions: <a href="http://www.coreboot.org/Board:lenovo/x60/Installation">http://www.coreboot.org/Board:lenovo/x60/Installation</a>.
+ </p>
+ </div>
+
+ <div class="section">
+
+ <h1 id="recovery">bad rom (or user error), machine won't boot</h1>
+ <p>
+ In this scenario, you compiled a ROM that had an incorrect configuration, or there is an actual bug preventing your machine from
+ booting. Or, maybe, you set BUC.TS to 0 and shut down after first flash while Lenovo BIOS was running. In any case, your machine is bricked and will not boot at all.
+ </p>
+ <p>
+ &quot;Unbricking&quot; means flashing a known-good (working) ROM. The problem: you can't boot the machine, making this difficult. In this situation, external hardware (see hardware requirements above) is needed which can flash the SPI chip (where libreboot resides).
+ </p>
+
+ <p>
+ <img src="../images/x60t_unbrick/0000.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove those screws:<br/>
+ <img src="../images/x60t_unbrick/0001.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove the HDD:<br/>
+ <img src="../images/x60t_unbrick/0002.JPG" alt="" />
+ </p>
+
+ <p>
+ Push keyboard forward to loosen it:<br/>
+ <img src="../images/x60t_unbrick/0003.JPG" alt="" />
+ </p>
+
+ <p>
+ Lift:<br/>
+ <img src="../images/x60t_unbrick/0004.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove those:<br/>
+ <img src="../images/x60t_unbrick/0005.JPG" alt="" />
+ </p>
+
+ <p>
+
+ <img src="../images/x60t_unbrick/0006.JPG" alt="" />
+ </p>
+
+ <p>
+ Also remove that (marked) and unroute the antenna cables:<br/>
+ <img src="../images/x60t_unbrick/0007.JPG" alt="" />
+ </p>
+
+ <p>
+ For some X60T laptops, you have to unroute those too:<br/>
+ <img src="../images/x60t_unbrick/0010.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove the LCD extend board screws. Also remove those screws (see blue marks) and remove/unroute the cables and remove the metal plate:<br/>
+ <img src="../images/x60t_unbrick/0008.JPG" alt="" />
+ </p>
+
+ <p>
+ Remove that screw and then remove the board:<br/>
+ <img src="../images/x60t_unbrick/0009.JPG" alt="" />
+ </p>
- <img src="../images/x60t_unbrick/0006.JPG" alt="" />
- </p>
-
- <p>
- Also remove that (marked) and unroute the antenna cables:<br/>
- <img src="../images/x60t_unbrick/0007.JPG" alt="" />
- </p>
-
- <p>
- For some X60T laptops, you have to unroute those too:<br/>
- <img src="../images/x60t_unbrick/0010.JPG" alt="" />
- </p>
-
- <p>
- Remove the LCD extend board screws. Also remove those screws (see blue marks) and remove/unroute the cables and remove the metal plate:<br/>
- <img src="../images/x60t_unbrick/0008.JPG" alt="" />
- </p>
-
- <p>
- Remove that screw and then remove the board:<br/>
- <img src="../images/x60t_unbrick/0009.JPG" alt="" />
- </p>
-
- <p>
- Now wire up the BBB and the Pomona with your PSU.<br/>
- Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
- the BBB for flashing.<br/>
- <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the X60 Tablet:
- if you don't have or don't want to use an external PSU, then make
- sure not to connect the red/black 3.3v leads mentioned in the guide;
- instead, connect the AC adapter (the one that normally charges your
- battery) so that the board has power (but don't boot it up)</b>
- <img src="../images/x60t_unbrick/0011.JPG" alt="" /><br/>
- Correlate the following with the BBB guide linked above:
- </p>
+ <p>
+ Now wire up the BBB and the Pomona with your PSU.<br/>
+ Refer to <a href="bbb_setup.html">bbb_setup.html</a> for how to setup
+ the BBB for flashing.<br/>
+ <b>Note, the guide mentions a 3.3v DC PSU but you don't need this on the X60 Tablet:
+ if you don't have or don't want to use an external PSU, then make
+ sure not to connect the red/black 3.3v leads mentioned in the guide;
+ instead, connect the AC adapter (the one that normally charges your
+ battery) so that the board has power (but don't boot it up)</b>
+ <img src="../images/x60t_unbrick/0011.JPG" alt="" /><br/>
+ Correlate the following with the BBB guide linked above:
+ </p>
<pre>
POMONA 5250:
=== golden finger and wifi switch ====
@@ -133,37 +138,41 @@ POMONA 5250:
<i>This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.</i>
</pre>
- <p>
- Connecting the BBB and pomona (in this image, an external 3.3v DC PSU was used):<br/>
- <img src="images/x60/th_bbb_flashing.jpg" alt="" />
- </p>
+ <p>
+ Connecting the BBB and pomona (in this image, an external 3.3v DC PSU was used):<br/>
+ <img src="images/x60/th_bbb_flashing.jpg" alt="" />
+ </p>
+
+ <p>
+ SSH'd into the BBB:<br/>
+ # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
+ </p>
+ <p>
+ It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
+ definitions detected, then choose one of them following the instructions in the output.
+ </p>
+
+ <p>
+ Reverse the steps to re-assemble your machine.
+ </p>
+
+ </div>
+
+ <div class="section">
<p>
- SSH'd into the BBB:<br/>
- # <b>./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom</b>
- </p>
- <p>
- It should be <b>Verifying flash... VERIFIED</b> at the end. If flashrom complains about multiple flash chip
- definitions detected, then choose one of them following the instructions in the output.
+ Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+ This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+ A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
</p>
<p>
- Reverse the steps to re-assemble your machine.
+ This document 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 <a href="../license.txt">../license.txt</a> for more information.
</p>
-
-<hr/>
-
- <p>
- Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
- This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
- A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
- </p>
-
- <p>
- This document 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 <a href="../license.txt">../license.txt</a> for more information.
- </p>
+
+ </div>
</body>
</html>