Remove ThinkPad R500 support (wasn't ready for production use yet anyway)

R500 support in its current state should not be merged in the master branch.
This will likely not make it into the immediate upcoming release. This patch
will be reverted in a separate experimental branch, for the time being.

8 files changed, 2 insertions, 470 deletions

diff --git a/docs/src/hcl/gm45_lcd.texi b/docs/src/hcl/gm45_lcd.texi
index e1e87e1..7d3090c 100644
--- a/docs/src/hcl/gm45_lcd.texi
+++ b/docs/src/hcl/gm45_lcd.texi
@@ -23,8 +23,6 @@
 @anchor{#lcd-compatibility-on-gm45-laptops}
 On the T400 and T500 (maybe others), some of the higher resolution panels (e.g. 1440x900, 1680x1050, 1920x1200) fail in libreboot.
 
-It is currently unknown, whether there exist any compatibility issues on the ThinkPad R500.
-
 @strong{All X200/X200S/X200T LCD panels are believed to be compatible.}
 
 @uref{index.html,Back to previous index}.
diff --git a/docs/src/hcl/gm45_remove_me.texi b/docs/src/hcl/gm45_remove_me.texi
index 27c4e6e..43cb81a 100644
--- a/docs/src/hcl/gm45_remove_me.texi
+++ b/docs/src/hcl/gm45_remove_me.texi
@@ -63,19 +63,8 @@ Two new files will be created:
 @strong{ich9fdgbe_8m.bin}: this is for GM45 laptops with the 8MB flash chip.
 @end itemize
 
-Two other files will also be created, for the ThinkPad R500 which has a different NIC and, therefore, no GbE region (for this laptop, it is not necessary to change the MAC address in the flash chip, because it's burned into the NIC):
-
-@itemize
-@item
-@strong{ich9fdnogbe_4m.bin}: this is for ThinkPad R500 laptops with the 4MB flash chip, where no GbE region is to be defined.
-@item
-@strong{ich9fdnogbe_8m.bin}: this is for ThinkPad R500 laptops with the 8MB flash chip, where no GbE region is to be defined - @strong{NOTE: No actual R500 laptops with 8MiB are believed to exist. It is believed, that all R500 laptops have 4MiB flash chips}.
-@end itemize
-
 Assuming that your libreboot image is named @strong{libreboot.rom}, copy the file to where @strong{libreboot.rom} is located and then insert the descriptor+gbe file into the ROM image. For 8MiB flash chips:@* $ @strong{dd if=ich9fdgbe_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc}@* For 4MiB flash chips:@* $ @strong{dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc}@*
 
-@strong{For the ThinkPad R500, do this instead:}@* For 8MiB flash chips (@strong{highly unlikely on the ThinkPad R500)}:@* $ @strong{dd if=ich9fdnogbe_8m.bin of=libreboot.rom bs=1 count=4k conv=notrunc}@* For 4MiB flash chips (@strong{You probably have this)}:@* $ @strong{dd if=ich9fdnogbe_4m.bin of=libreboot.rom bs=1 count=4k conv=notrunc}@* NOTE: This shouldn't be necessary. Libreboot ROM images already contain a descriptor embedded inside the ROM images for GM45, generated by the ich9gen utility. It's only desirable to re-insert your own when changing the MAC address, which is unnecessary (actually impossible) on the R500, because on that laptop, as already stated, the NIC already has the correct MAC address burned in, along with along configuration data.
-
 Your libreboot.rom image is now ready to be flashed on the system. Refer back to @uref{../install/index.html#flashrom,../install/index.html#flashrom} for how to flash it.
 @menu
 * Write-protecting the flash chip::
diff --git a/docs/src/hcl/index.texi b/docs/src/hcl/index.texi
index c1ba0b3..e8e6583 100644
--- a/docs/src/hcl/index.texi
+++ b/docs/src/hcl/index.texi
@@ -106,8 +106,6 @@ Libreboot supports the following systems in this release:
 @item
 @uref{r400.html,Lenovo ThinkPad R400}
 @item
-@uref{r500.html,Lenovo ThinkPad R500}
-@item
 @uref{t400.html,Lenovo ThinkPad T400}
 @item
 @uref{t500.html,Lenovo ThinkPad T500}
diff --git a/docs/src/hcl/r500.texi b/docs/src/hcl/r500.texi
deleted file mode 100644
index f8bd10a..0000000
--- a/docs/src/hcl/r500.texi
+++ /dev/null
@@ -1,190 +0,0 @@
-\input texinfo
-@documentencoding UTF-8
-
-@ifnottex
-@paragraphindent 0
-@end ifnottex
-@titlepage
-@title ThinkPad R500
-@end titlepage
-
-@node Top
-@top ThinkPad R500
-
-@menu
-* ThinkPad R500::
-* LCD compatibly::
-* Issues::
-* Descriptor differences::
-* No Gbe region!::
-@end menu
-
-@node ThinkPad R500
-@chapter ThinkPad R500
-@anchor{#thinkpad-r500}
-It is believed that all or most R500 laptops are compatible. See notes about @uref{../install/r500_external.html#cpu_compatibility,CPU compatibility} for potential incompatibilities.
-
-There are two possible flash chip sizes for the R500: 4MiB (32Mbit) or 8MiB (64Mbit). This can be identified by the type of flash chip below the palmrest: 4MiB is SOIC-8, 8MiB is SOIC-16. @strong{NOTE: this paragraph is being treated with contempt. When an R500 was disassembled, it didn't look like there was an extra place for SOIC-16. It's highly likely that these laptops only have SOIC-8 (4MiB) flash chips. For now, libreboot will distribute 8MiB images just in case. If it is found later on that no 8MiB (SOIC-16) chips exist on the R500, then libreboot will cease to distribute 8MiB ROM images for this laptop. It is only said that the R500 has 4MiB or 8MiB, for now, since this is the case on other GM45 thinkpads that are supported in libreboot.}
-
-@strong{The R400 laptops come with the ME (and sometimes AMT in addition) before flashing libreboot. Libreboot disables and removes it by using a modified descriptor: see @uref{gm45_remove_me.html,gm45_remove_me.html}} (contains notes, plus instructions)
-
-Flashing instructions can be found at @uref{../install/index.html#flashrom,../install/index.html#flashrom}
-
-@strong{NOTE: This board is unsupported in libreboot 20150518. To use it in libreboot, for now, you must build for it from source using the libreboot git repository.}
-
-@uref{index.html,Back to previous index}.
-@menu
-* Compatibility without blobs::
-@end menu
-
-@node Compatibility without blobs
-@section Compatibility (without blobs)
-@anchor{#compatibility-without-blobs}
-@menu
-* Hardware virtualization vt-x::
-@end menu
-
-@node Hardware virtualization vt-x
-@subsection Hardware virtualization (vt-x)
-@anchor{#hardware-virtualization-vt-x}
-The R400, when run without CPU microcode updates in coreboot, currently kernel panics if running QEMU with vt-x enabled on 2 cores for the guest. With a single core enabled for the guest, the guest panics (but the host is fine). Working around this in QEMU might be possible; if not, software virtualization should work fine (it's just slower).
-
-On GM45 hardware (with libreboot), make sure that the @emph{kvm} and @emph{kvm_intel} kernel modules are not loaded, when using QEMU.
-
-The following errata datasheet from Intel might help with investigation: @uref{http://download.intel.com/design/mobile/specupdt/320121.pdf,http://download.intel.com/design/mobile/specupdt/320121.pdf}
-
-@node LCD compatibly
-@chapter LCD compatibly
-@anchor{#lcd-compatibly}
-Not all LCD panels are known to be compatible yet. See @uref{gm45_lcd.html,gm45_lcd.html}.
-
-The R500 is almost identical to the X200, code-wise, but there are some hardware differences. See @uref{x200.html,x200.html}.
-@menu
-* Hardware register dumps::
-@end menu
-
-@node Hardware register dumps
-@section Hardware register dumps
-@anchor{#hardware-register-dumps}
-The coreboot wiki @uref{http://www.coreboot.org/Motherboard_Porting_Guide,shows} how to collect various logs useful in porting to new boards. Following are outputs from the R500:
-
-@itemize
-@item
-Lenovo BIOS 3.13 (EC firmware 1.06):
-@itemize
-@item
-@url{../resources/misc/dumps/r500/}
-@end itemize
-
-@end itemize
-
-@node Issues
-@chapter Issues
-@anchor{#issues}
-@menu
-* False report of overheating automatic shut down::
-* Cardbus slot didn't work when tested::
-@end menu
-
-@node False report of overheating automatic shut down
-@section False report of overheating, automatic shut down
-@anchor{#false-report-of-overheating-automatic-shut-down}
-When attempting to boot Trisquel 7 live USB (GNOME), the following error appears and then the system abruptly shuts down: @strong{thermal thermal_zone1: critical temperature reached(120 C),shutting down}.
-
-This is false. When booting with @strong{acpi=off}, xsensors shows no overheating during a stress test. The system does not feel hot, nor does anything smell like it's burning.
-
-This is most likely caused by an ACPI bug in coreboot, which will have to be investigated. Grep for those things, comparing factory/libreboot (iasl -d or acpidump):
-
-@verbatim
- Return (C2K(\_SB.PCI0.LPCB.EC.TMP0))
-TMP0, 8,        /* Thermal Zone 0 temperature */
-@end verbatim
-
-@node Cardbus slot didn't work when tested
-@section Cardbus slot didn't work when tested
-@anchor{#cardbus-slot-didnt-work-when-tested}
-Investigate.
-
-@node Descriptor differences
-@chapter Descriptor differences
-@anchor{#descriptor-differences}
-The @emph{ich9gen} and @emph{ich9deblob} utilities were modified, to reflect these differences.
-@menu
-* Component 1 Density::
-* flReg1LIMIT::
-* Onboard gigabit ethernet NIC is disabled::
-@end menu
-
-@node Component 1 Density
-@section Component 1 Density
-@anchor{#component-1-density}
-
-@verbatim
--    descriptorStruct.componentSection.flcomp.component1Density = 0x4;
-+    descriptorStruct.componentSection.flcomp.component1Density = 0x3;
-@end verbatim
-
-Read page 848 in the ICH9 datasheet, linked to from @uref{gm45_remove_me.html#flash_descriptor_region,gm45_remove_me.html#flash_descriptor_region}. This doesn't break anything, but in the process of debugging descriptor differences on the R500, it was found that this config option isn't being modified in libreboot, for different size ROM images. 4MiB ROM images still contain 0x4 for component1Density. Per datasheets, 0x4 (100) is 8MiB, and 0x3 (011) is 4MiB. @strong{This should be fixed!}
-
-It was 0x3 for this test, because the R500 that was used to create this report had a 4MiB SOIC-8 flash chip.
-
-@node flReg1LIMIT
-@section flReg1.LIMIT
-@anchor{#flreg1.limit}
-
-@verbatim
--    /* descriptorStruct.regionSection.flReg1.LIMIT = 0x07ff; */
-+    /* descriptorStruct.regionSection.flReg1.LIMIT = 0x03ff; */
-@end verbatim
-
-Ignore this. This is not used at all, and is instead automatically set, depending on the targetted ROM image size, both in ich9gen and ich9deblob. 0x7ff means 8MiB, and 0x3ff means 4MiB. flReg1 is for the BIOS region. Simply speaking, this is defining the final 4KiB section of the ROM image, where the BIOS region ends.
-
-It was 0x3ff for this test, because the R500 that was used to create this report had a 4MiB SOIC-8 flash chip.
-
-@node Onboard gigabit ethernet NIC is disabled
-@section Onboard gigabit ethernet NIC is disabled
-@anchor{#onboard-gigabit-ethernet-nic-is-disabled}
-
-@verbatim
--    descriptorStruct.ichStraps.ichStrap0.integratedGbe = 0x1;
--    descriptorStruct.ichStraps.ichStrap0.lanPhy = 0x1;
-+    descriptorStruct.ichStraps.ichStrap0.integratedGbe = 0x0;
-+    descriptorStruct.ichStraps.ichStrap0.lanPhy = 0x0;
-@end verbatim
-
-Most GM45 laptops (e.g. X200, T400, T500, R400) have the @strong{Intel 82567LM} integrated gigabit NIC.
-
-On the R500, a @strong{Broadcom BCM5787M} NIC is present. To make this work, the change above must be made for the R500 descriptor.
-
-@node No Gbe region!
-@chapter No Gbe region!
-@anchor{#no-gbe-region}
-Not shown in the diffs above:
-
-@verbatim
-Original: Descriptor start block: 00000000 ; Descriptor end block: 00000000
-Original: BIOS start block: 00200000 ; BIOS end block: 003ff000
-Original: ME start block: 00001000 ; ME end block: 001f7000
-Original: GBe start block: 00fff000 ; GBe end block: 00000000
-Original: Platform start block: 001f8000 ; Platform end block: 001ff000
-@end verbatim
-
-As explained above, this laptop uses a Broadcom NIC, which means that the Gbe region does not and @emph{should not} exist, since this is for the Intel NIC only.
-
-In the output above, Gbe starts at fff and ends at 000. Base 1FFF or FFF, and limit 0, means that the region is disabled.
-
-In the output above, the ME region is 4KiB larger than on other GM45 systems that have a Gbe region. This accounts for the lack of a Gbe region.
-
-As part of this effort, ich9gen/ich9deblob/demefactory will all be modified to account for the differences above.
-
-Copyright © 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../resources/licenses/gfdl-1.3.txt,gfdl-1.3.txt}
-
-Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
-
-UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-@bye
diff --git a/docs/src/install/index.texi b/docs/src/install/index.texi
index ddcaa5e..0ed27b4 100644
--- a/docs/src/install/index.texi
+++ b/docs/src/install/index.texi
@@ -75,8 +75,6 @@ This section relates to installing libreboot on supported targets.
 @item
 @uref{r400_external.html,ThinkPad R400 (needed if running the proprietary firmware, or to unbrick)}
 @item
-@uref{r500_external.html,ThinkPad R500 (needed if running the proprietary firmware, or to unbrick)}
-@item
 @uref{t400_external.html,ThinkPad T400 (needed if running the proprietary firmware, or to unbrick)}
 @item
 @uref{t500_external.html,ThinkPad T500 (needed if running the proprietary firmware, or to unbrick)}
@@ -146,7 +144,7 @@ If you are currently running the proprietary firmware (not libreboot or coreboot
 
 X60/T60 users running the proprietary firmware should refer to @ref{#flashrom_lenovobios,#flashrom_lenovobios}. MacBook2,1 users running Apple EFI should refer to @ref{#flashrom_macbook21,#flashrom_macbook21}
 
-X200 users, refer to @uref{x200_external.html,x200_external.html}, R400 users refer to @uref{r400_external.html,r400_external.html}, R500 users refer to @uref{r500_external.html,r500_external.html}, T400 users refer to @uref{t400_external.html,t400_external.html}, T500 users refer to @uref{t500_external.html,t500_external.html}
+X200 users, refer to @uref{x200_external.html,x200_external.html}, R400 users refer to @uref{r400_external.html,r400_external.html}, T400 users refer to @uref{t400_external.html,t400_external.html}, T500 users refer to @uref{t500_external.html,t500_external.html}
 
 @node ASUS KFSN4-DRE?
 @section ASUS KFSN4-DRE?
@@ -188,7 +186,7 @@ Do check the HCL entry: @uref{../hcl/kcma-d8.html,../hcl/kcma-d8.html}
 @anchor{#are-you-currently-running-libreboot-or-coreboot}
 X60/T60 users should be fine with this guide. If you write-protected the flash chip, please refer to @uref{x60_unbrick.html,x60_unbrick.html}, @uref{x60tablet_unbrick.html,x60tablet_unbrick.html} or @uref{t60_unbrick.html,t60_unbrick.html}. @emph{This probably does not apply to you. Most people do not write-protect the flash chip, so you probably didn't either.}
 
-Similarly, it is possible to write-protect the flash chip in coreboot or libreboot on GM45 laptops (X200/R400/R500/T400/T500). If you did this, then you will need to use the links above for flashing, treating your laptop as though it currently has the proprietary firmware (because write-protected SPI flash requires external re-flashing, as is also the case when running the proprietary firmware).
+Similarly, it is possible to write-protect the flash chip in coreboot or libreboot on GM45 laptops (X200/R400/T400/T500). If you did this, then you will need to use the links above for flashing, treating your laptop as though it currently has the proprietary firmware (because write-protected SPI flash requires external re-flashing, as is also the case when running the proprietary firmware).
 
 If you did not write-protect the flash chip, or it came to you without any write-protection (@strong{@emph{libreboot does not write-protect the flash chip by default, so this probably applies to you}}), read on!
 
@@ -199,8 +197,6 @@ If you did not write-protect the flash chip, or it came to you without any write
 
 It is important that you change the default MAC address, before flashing. It will be printed on a sticker at the bottom of the laptop, or it will be printed on a sticker next to or underneath the RAM. Alternatively, and assuming that your current firmware has the correct MAC address in it, you can get it from your OS.
 
-@strong{R500 users: your laptop lacks a GbE region, because it has a different NIC. You do not need to change the MAC address on this laptop; it will already be correct. You can simply flash the available ROM images for the R500, as-is. See @uref{../hcl/r500.html#nogbe,../hcl/r500.html#nogbe}.}
-
 @node Flash chip size
 @section Flash chip size
 @anchor{#flash-chip-size}
diff --git a/docs/src/install/r500_external.texi b/docs/src/install/r500_external.texi
deleted file mode 100644
index b3e0849..0000000
--- a/docs/src/install/r500_external.texi
+++ /dev/null
@@ -1,242 +0,0 @@
-\input texinfo
-@documentencoding UTF-8
-
-@ifnottex
-@paragraphindent 0
-@end ifnottex
-@titlepage
-@title ThinkPad R500: flashing tutorial (BeagleBone Black)
-@end titlepage
-
-@node Top
-@top ThinkPad R500: flashing tutorial (BeagleBone Black)
-
-@menu
-* Flashing the R500 with a BeagleBone Black::
-* LCD compatibly::
-* A note about CPUs::
-* A note about GPUs::
-* CPU paste required::
-* Flash chip size::
-* MAC address::
-* Initial BBB configuration::
-* Thermal paste IMPORTANT::
-* Wifi::
-* WWAN::
-* Memory::
-@end menu
-
-@node Flashing the R500 with a BeagleBone Black
-@chapter Flashing the R500 with a BeagleBone Black
-@anchor{#flashing-the-r500-with-a-beaglebone-black}
-Initial flashing instructions for R500.
-
-This guide is for those who want libreboot on their ThinkPad R500 while they still have the original Lenovo BIOS present. This guide can also be followed (adapted) if you brick your R500, to know how to recover.
-
-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)
-
-@strong{NOTE: This board is unsupported in libreboot 20150518. To use it in libreboot, for now, you must build for it from source using the libreboot git repository.}
-
-@uref{index.html,Back to main index}
-@menu
-* Serial port::
-@end menu
-
-@node Serial port
-@section Serial port
-@anchor{#serial-port}
-EHCI debug might not be needed. It has been reported that the docking station for this laptop has a serial port, so it might be possible to use that instead.
-
-@node LCD compatibly
-@chapter LCD compatibly
-@anchor{#lcd-compatibly}
-Not all LCD panels are known to be compatible yet. See @uref{../hcl/gm45_lcd.html,../hcl/gm45_lcd.html}.
-
-@node A note about CPUs
-@chapter A note about CPUs
-@anchor{#a-note-about-cpus}
-@uref{http://www.thinkwiki.org/wiki/Category:R500,ThinkWiki} has a list of CPUs for this system. The Core 2 Duo P8400, P8600 and P8700 are believed to work in libreboot. The Core 2 Duo T9600 was confirmed to work (on a different laptop, but still GM45), so the T9400 probably also works. @strong{The Core 2 Duo T5870/5670 and Celeron M 575/585 are untested!}
-@menu
-* Quad-core CPUs::
-@end menu
-
-@node Quad-core CPUs
-@section Quad-core CPUs
-@anchor{#quad-core-cpus}
-Incompatible. Do not use.
-
-@node A note about GPUs
-@chapter A note about GPUs
-@anchor{#a-note-about-gpus}
-@uref{http://www.thinkwiki.org/wiki/Category:R500,ThinkWiki} lists two possible GPUs: Intel or ATI. Only the Intel GPUs work in libreboot; the ATI GPUs require a proprietary Video BIOS, and so those are unsupported in libreboot.
-
-On other GM45 laptops in libreboot (e.g. T400, T500), so-called @emph{switchable graphics} is used, which means that the laptop will have @strong{both} an ATI and Intel GPU, or it will only have Intel, depending on which variation you have. On the systems with ATI and Intel, you can disable the ATI GPU and use only the Intel GPU, which works in libreboot.
-
-@strong{It is unknown whether R500 laptops with an ATI GPU still have an Intel GPU, where you could disable the ATI GPU and use the Intel GPU. These are budget laptops, so it's highly likely that Lenovo decided on this model to ship with one GPU or the other, but not both (GPUs cost money).}
-
-@strong{It is **HIGHLY** recommended, when ordering an R500 laptop, to **ENSURE** that the one you're ordering has an Intel GPU.}
-
-@node CPU paste required
-@chapter CPU paste required
-@anchor{#cpu-paste-required}
-See @ref{#paste,#paste}.
-
-@node Flash chip size
-@chapter Flash chip size
-@anchor{#flash-chip-size}
-Use this to find out:@* # @strong{dmidecode | grep ROM\ Size}@*
-
-It is believed that all R500 laptops have only SOIC-8 (4MiB) chips.
-
-@ref{#pagetop,Back to top of page.}
-
-@node MAC address
-@chapter MAC address
-@anchor{#mac-address}
-Unlike other GM45 thinkpads, the R500 has a different onboard gigabit NIC, where the MAC address is built-in. You do not need to change the MAC address at all on this laptop; simply flash the provided ROM images, as-is.
-
-@node Initial BBB configuration
-@chapter Initial BBB configuration
-@anchor{#initial-bbb-configuration}
-Refer to @uref{bbb_setup.html,bbb_setup.html} for how to setup the BBB for flashing.
-
-The following shows how to connect clip to the BBB (on the P9 header), for SOIC-8 (clip: Pomona 5250):
-
-@verbatim
-POMONA 5250 (correlate with the BBB guide)
-===  VGA and ethernet socket ===
- 18              -       - 1
- 22              -       - NC
- NC              -       - 21
- 3.3V (PSU)      -       - 17 - this is pin 1 on the flash chip
-===  DVD drive ===
-This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack.
-@end verbatim
-
-@menu
-* Disassembly::
-@end menu
-
-@node Disassembly
-@section Disassembly
-@anchor{#disassembly}
-@image{../resources/images/r500/0001,,,,JPG} @image{../resources/images/r500/0002,,,,JPG} @image{../resources/images/r500/0003,,,,JPG} @image{../resources/images/r500/0004,,,,JPG} @image{../resources/images/r500/0005,,,,JPG} @image{../resources/images/r500/0006,,,,JPG} @image{../resources/images/r500/0007,,,,JPG} @image{../resources/images/r500/0008,,,,JPG} @image{../resources/images/r500/0009,,,,JPG} @image{../resources/images/r500/0010,,,,JPG} @image{../resources/images/r500/0011,,,,JPG} @image{../resources/images/r500/0012,,,,JPG} @image{../resources/images/r500/0013,,,,JPG} @image{../resources/images/r500/0014,,,,JPG} @image{../resources/images/r500/0015,,,,JPG} @image{../resources/images/r500/0016,,,,JPG} @image{../resources/images/r500/0017,,,,JPG} @image{../resources/images/r500/0018,,,,JPG} @image{../resources/images/r500/0019,,,,JPG} @image{../resources/images/r500/0020,,,,JPG} @image{../resources/images/r500/0021,,,,JPG} @image{../resources/images/r500/0022,,,,JPG} @image{../resources/images/r500/0023,,,,JPG} @image{../resources/images/r500/0024,,,,JPG} @image{../resources/images/r500/0025,,,,JPG} @image{../resources/images/r500/0026,,,,JPG} @image{../resources/images/r500/0027,,,,JPG} @image{../resources/images/r500/0028,,,,JPG} @image{../resources/images/r500/0029,,,,JPG} @image{../resources/images/r500/0030,,,,JPG} @image{../resources/images/r500/0031,,,,JPG}
-
-Remove the motherboard from the cage, and the SPI flash chip will be next to the memory slots:@* @image{../resources/images/r500/0032,,,,JPG} @image{../resources/images/r500/flashchip,,,,jpg}
-
-The following image is for illustration only, to show how a SOIC-8 clip is connected. This photo is from a T500, which has a different arrangement to the R500:@* @image{../resources/images/t500/0061,,,,jpg}
-
-Connect your programmer, then connect GND and 3.3V@* @image{../resources/images/t400/0067,,,,jpg} @image{../resources/images/t400/0069,,,,jpg} @image{../resources/images/t400/0070,,,,jpg} @image{../resources/images/t400/0071,,,,jpg}
-
-A dedicated 3.3V PSU was used to create this guide, but at ATX PSU is also fine:@* @image{../resources/images/t400/0072,,,,jpg}
-
-Of course, make sure to turn on your PSU:@* @image{../resources/images/x200/disassembly/0013,,,,jpg}
-
-Now, you should be ready to install libreboot.
-
-Flashrom binaries for ARM (tested on a BBB) are distributed in libreboot_util. Alternatively, libreboot also distributes flashrom source code which can be built.
-
-Log in as root on your BBB, using the instructions in @uref{bbb_setup.html#bbb_access,bbb_setup.html#bbb_access}.
-
-Test that flashrom works:@* # @strong{./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512}@* In this case, the output was:
-
-@verbatim
-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
-Calibrating delay loop... OK.
-Found Macronix flash chip "MX25L6405(D)" (8192 kB, SPI) on linux_spi.
-Found Macronix flash chip "MX25L6406E/MX25L6436E" (8192 kB, SPI) on linux_spi.
-Found Macronix flash chip "MX25L6445E/MX25L6473E" (8192 kB, SPI) on linux_spi.
-Multiple flash chip definitions match the detected chip(s): "MX25L6405(D)", "MX25L6406E/MX25L6436E", "MX25L6445E/MX25L6473E"
-Please specify which chip definition to use with the -c <chipname> option.
-@end verbatim
-
-How to backup factory.rom (change the -c option as neeed, for your flash chip):@* # @strong{./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom}@* # @strong{./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom}@* # @strong{./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom}@* Note: the @strong{-c} option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in @emph{flashchips.c} have been removed.@* Now compare the 3 images:@* # @strong{sha512sum factory*.rom}@* If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable behaviour in the original firmware that could be replicated in coreboot and libreboot.
-
-Now flash it:@* # @strong{./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V}
-
-@image{../resources/images/x200/disassembly/0015,,,,jpg}
-
-You might see errors, but if it says @strong{Verifying flash... VERIFIED} at the end, then it's flashed and should boot. If you see errors, try again (and again, and again); the message @strong{Chip content is identical to the requested image} is also an indication of a successful installation.
-
-Example output from running the command (see above):
-
-@verbatim
-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
-Calibrating delay loop... OK.
-Found Macronix flash chip "MX25L6405(D)" (8192 kB, SPI) on linux_spi.
-Reading old flash chip contents... done.
-Erasing and writing flash chip... FAILED at 0x00001000! Expected=0xff, Found=0x00, failed byte count from 0x00000000-0x0000ffff: 0xd716
-ERASE FAILED!
-Reading current flash chip contents... done. Looking for another erase function.
-Erase/write done.
-Verifying flash... VERIFIED.
-@end verbatim
-
-@ref{#pagetop,Back to top of page.}
-
-@node Thermal paste IMPORTANT
-@chapter Thermal paste (IMPORTANT)
-@anchor{#thermal-paste-important}
-Because part of this procedure involved removing the heatsink, you will need to apply new paste. Arctic Silver 5 is ok. You will also need isopropyl alcohol and an anti-static cloth to clean with.
-
-When re-installing the heatsink, you must first clean off all old paste with the alcohol/cloth. Then apply new paste. AS5 is also much better than the default paste used on these systems.
-
-@image{../resources/images/t400/paste,,,,jpg}
-
-NOTE: the photo above is for illustration purposes only, and does not show how to properly apply the thermal paste. Other guides online detail the proper application procedure.
-
-@node Wifi
-@chapter Wifi
-@anchor{#wifi}
-The R500 typically comes with an Intel wifi chipset, which does not work without proprietary software. For a list of wifi chipsets that work without proprietary software, see @uref{../hcl/index.html#recommended_wifi,../hcl/index.html#recommended_wifi}.
-
-Some R500 laptops might come with an Atheros chipset, but this is 802.11g only.
-
-It is recommended that you install a new wifi chipset. This can only be done after installing libreboot, because the original firmware has a whitelist of approved chips, and it will refuse to boot if you use an 'unauthorized' wifi card.
-
-The following photos show an Atheros AR5B95 being installed, to replace the Intel chip that this R500 came with:@* @image{../resources/images/t400/0012,,,,jpg} @image{../resources/images/t400/ar5b95,,,,jpg}
-
-@node WWAN
-@chapter WWAN
-@anchor{#wwan}
-If you have a WWAN/3G card and/or sim card reader, remove them permanently. The WWAN-3G card has proprietary firmware inside; the technology is identical to what is used in mobile phones, so it can also track your movements.
-
-Not to be confused with wifi (wifi is fine).
-
-@node Memory
-@chapter Memory
-@anchor{#memory}
-You need DDR3 SODIMM PC3-8500 RAM installed, in matching pairs (speed/size). Non-matching pairs won't work. You can also install a single module (meaning, one of the slots will be empty) in slot 0.
-
-Make sure that the RAM you buy is the 2Rx8 density.
-
-@uref{http://www.forum.thinkpads.com/viewtopic.php?p=760721, This page} might be useful for RAM compatibility info
-(note: coreboot raminit is different, so this page might be BS)
-
-The following photo shows 8GiB (2x4GiB) of RAM installed:@* @image{../resources/images/t400/memory,,,,jpg}
-@menu
-* Boot it!::
-@end menu
-
-@node Boot it!
-@section Boot it!
-@anchor{#boot-it}
-You should see something like this:
-
-@image{../resources/images/t400/boot0,,,,jpg} @image{../resources/images/t400/boot1,,,,jpg}
-
-Now @uref{../gnulinux/index.html,install GNU/Linux}.
-
-Copyright © 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../resources/licenses/gfdl-1.3.txt,gfdl-1.3.txt}
-
-Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
-
-UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-@bye
diff --git a/docs/src/release.texi b/docs/src/release.texi
index 7dfe657..19c4941 100644
--- a/docs/src/release.texi
+++ b/docs/src/release.texi
@@ -148,17 +148,6 @@ See @strong{@emph{hcl/r400.html}}
 @end itemize
 
 @item
-@strong{ThinkPad R500}
-@itemize
-@item
-See @strong{@emph{hcl/r500.html}}
-@item
-@strong{ME/AMT}: libreboot removes this, permanently. @strong{@emph{hcl/gm45_remove_me.html}}
-@item
-@strong{NOTE: not in libreboot 20150518. Only in git, for now.}
-@end itemize
-
-@item
 @strong{ThinkPad T400}
 @itemize
 @item
diff --git a/docs/src/tasks.texi b/docs/src/tasks.texi
index 77e03cc..15bfa9a 100644
--- a/docs/src/tasks.texi
+++ b/docs/src/tasks.texi
@@ -86,8 +86,6 @@ now only text mode works, including in GNU/Linux)
 @item
 GuixSD /boot/ FDE full disk encryption guide.
 @item
-fix up R500 port (if not ready before wanting to release, just remove R500 before release)
-@item
 add W500 (probably won't be done before release, but a user did report that it does work
 with T500 ROM images iirc)
 @item
@@ -197,8 +195,6 @@ Non-lenovo GM45 laptops:
 @item
 GM45: suspend stopped working recently in libreboot.git, but worked in 20150518. Do a git bisect of coreboot for the relevant commit IDs, then implement a fix.
 @item
-Several serious bugs exist on the ThinkPad R500, which makes the system virtually unusable. See @uref{hcl/r500/index.html#issues,hcl/r500/index.html#issues}.
-@item
 GM45: investigate S3/raminit on all models (CPU stepping/cpuid). See @uref{hcl/x200.html#ram_s3_microcode,hcl/x200.html#ram_s3_microcode}
 @item
 all thinkpads: When the system is running, plugging in an ethernet cable doesn't always work (no network), you have to try several times. Booting with an ethernet cable attached is reliable. Debug this and fix it.
@@ -320,8 +316,6 @@ Next release after 20150518, relating to the ASUS KFSN4-DRE:
 Remove the notes in release.html that say @emph{NOTE: not in libreboot 20150518. Only in git, for now.}
 @item
 Remove the note in hcl/kfsn4-dre.html that says @emph{NOTE: This board is unsupported in libreboot 20150518. To use it in libreboot, for now, you must build for it from source using the libreboot git repository.}
-@item
-Remove the note in hcl/r500.html that says @emph{NOTE: This board is unsupported in libreboot 20150518. To use it in libreboot, for now, you must build for it from source using the libreboot git repository.}
 @end itemize
 
 @item