New board: ThinkPad R400 support added to libreboot.

12 files changed, 403 insertions, 670 deletions

diff --git a/docs/archive_old.html b/docs/archive_old.html
index 0a21922..f8f0585 100644
--- a/docs/archive_old.html
+++ b/docs/archive_old.html
@@ -140,7 +140,7 @@
 						<b>Lenovo ThinkPad X200</b>
 						<ul>
 							<li>X200S and X200 Tablet are also supported, conditionally; see <a href="hcl/x200.html">hcl/x200.html#x200s</a></li>
-							<li><b>ME/AMT</b>: libreboot removes this, permanently. <a href="hcl/x200_remove_me.html">hcl/x200_remove_me.html</a></li>
+							<li><b>ME/AMT</b>: libreboot removes this, permanently. <a href="hcl/gm45_remove_me.html">hcl/gm45_remove_me.html</a></li>
 						</ul>
 					</li>
 					<li>
diff --git a/docs/git/index.html b/docs/git/index.html
index cc61384..02c8279 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -34,6 +34,7 @@
 						<li><a href="#config_x60">ThinkPad X60, X60S and X60 Tablet</a></li>
 						<li><a href="#config_t60">ThinkPad T60</a></li>
 						<li><a href="#config_x200">ThinkPad X200</a></li>
+						<li><a href="#config_r400">ThinkPad R400</a></li>
 						<li><a href="#config_macbook21">MacBook2,1</a></li>
 						<li><a href="#config_qemu_i440fx_piix4">QEMU (x86 i440fx/piix4)</a></li>
 						<li><a href="#config_qemu_q35_ich9">QEMU (x86 q35/ich9)</a></li>
@@ -414,6 +415,50 @@
 						scripts for this machine.
 					</p>
 			</div>
+			
+			<div class="subsection">
+				<h2 id="config_r400">
+					ThinkPad R400 configuration (file: resources/libreboot/config/r400_4mb/config and resources/libreboot/config/r400_8mb/config)
+				</h2>
+					<p>
+						These are saved as two configs, because there are 2 size flash chips: 4MB or 8MB. 
+					</p>
+					<ul>
+						<li>General / Expert mode = <i>enable</i></li>
+						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
+						<li>Mainboard / Mainboard model = <i>ThinkPad R400</i></li>
+						<li>Mainboard / ROM chip size = <i>4096 KB (4 MB)</i> or <i>8192 KB (8 MB)</i> depending on flash chip size</li>
+						<li>Chipset / Include CPU microcode in CBFS = <i>Do not include microcode updates</i></li>
+						<li>Chipset / Size of CBFS filesystem in ROM = byte size <i>0x7FD000</i> (for 8MB flash chip) or <i>3FD000</i> (for 4MB flash chip)</li>
+						<li>Devices / Use native graphics initialization = <i>enable</i></li>
+						<li>
+							Display / Keep VESA framebuffer = <i>disable</i> (disable for text-mode graphics, enable for coreboot vesa framebuffer)
+							<ul>
+								<li>Libreboot provides this with text-mode enabled by default, but it automatically patches a copy of the config at build time
+								to enable coreboot framebuffer for a separate set of ROM images, in each machine.</li>
+							</ul>
+						</li>
+						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
+						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
+						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Console / USB dongle log output = <i>enable</i></li>
+						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
+						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
+					</ul>
+					<p>
+						Go back and disable option ROMs:
+					</p>
+					<ul>
+						<li>Devices / Run VGA Option ROMs = <i>disable</i></li>
+						<li>Devices / Run Option ROMs on PCI devices = <i>disable</i></li>
+					</ul>
+					<p>
+						The resulting .config file was saved as resources/libreboot/config/<b>r400_8mb/config</b> and
+						resources/libreboot/config/<b>r400_4mb/config</b> and is used by the build
+						scripts for this machine.
+					</p>
+			</div>
 
 			<div class="subsection">
 				<h2 id="config_macbook21">
@@ -542,7 +587,7 @@
 				On a ThinkPad T60, you can replace the CPU (Core 2 Duo T5600, T7200 or T7600. T5600 recommended) for 64-bit support. 
 				On an X60s, you can replace the board with one that has a Core 2 Duo L7400 (you could also use an X60 Tablet board with the same CPU).
 				On an X60, you can replace the board with one that has a Core 2 Duo T5600 or T7200 (T5600 is recommended). All MacBook2,1 laptops
-				are 64-bit, as are all ThinkPad X200, X200S and X200 Tablet laptops. Warning: MacBook1,1 laptops are all 32-bit only.
+				are 64-bit, as are all ThinkPad X200, X200S, X200 Tablet and R400 laptops. Warning: MacBook1,1 laptops are all 32-bit only.
 			</p>
 
 			<p>
diff --git a/docs/hcl/x200_remove_me.html b/docs/hcl/gm45_remove_me.html
index ae0a83f..d6c36f4 100644
--- a/docs/hcl/x200_remove_me.html
+++ b/docs/hcl/gm45_remove_me.html
@@ -8,23 +8,25 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>ThinkPad X200: remove the ME (manageability engine)</title>
+	<title>GM45 chipsets: remove the ME (manageability engine)</title>
 </head>
 
 <body>
 
 	<div class="section">
 		
-		<h1 id="pagetop">ThinkPad X200: remove the ME (manageability engine)</h1>
+		<h1 id="pagetop">GM45 chipsets: remove the ME (manageability engine)</h1>
 			<p>
-				This sections relates to disabling and removing the ME (Intel <b>M</b>anagement <b>E</b>ngine)
-				on the ThinkPad X200.
+				This sections relates to disabling and removing the ME (Intel <b>M</b>anagement <b>E</b>ngine) on
+				GM45. This was originally done on the ThinkPad X200, and later adapted for the ThinkPad R400. It can
+				in principle be done on any GM45 or GS45 machine.
 			</p>
 			<p>
 				The ME is a blob that typically must be left inside the flash chip (in the ME region, as outlined
-				by the default descriptor). On the X200, it is possible to remove it without any ill effects. All
-				other parts of coreboot on the X200 can be blob-free, so removing the ME was the last obstacle to
-				get X200 support in libreboot (the machine can also work without the microcode blobs). 
+				by the default descriptor). On GM45, it is possible to remove it without any ill effects. All
+				other parts of coreboot on GM45 machines (provided GMA MHD4500 / Intel graphics) can be blob-free,
+				so removing the ME was the last obstacle to
+				make GM45 a feasible target in libreboot (the machines can also work without the microcode blobs). 
 			</p>
 			<p>
 				The ME is removed and disabled in libreboot by modifying the descriptor. More info about
@@ -32,7 +34,7 @@
 				in libreboot, or more generally on this page.
 			</p>
 			<p>
-				<a href="x200.html">Back to main X200 compatibility page (x200.html)</a>.
+				<a href="index.html">Back to previous index</a>.
 			</p>
 			
 	</div>
@@ -42,7 +44,7 @@
 		<h1 id="ich9gen">ICH9 gen utility</h1>
 		
 			<p>
-				<b>This is no longer strictly necessary. Libreboot ROM images for X200 now
+				<b>This is no longer strictly necessary. Libreboot ROM images for GM45 now
 				contain the 12KiB descriptor+gbe generated from ich9gen, by default.</b>
 			</p>
 		
@@ -80,7 +82,7 @@
 			
 			<p>
 				A bash script is also included in libreboot which will change the mac address (using ich9gen)
-				on all X200 ROM images. For instance:<br/>
+				on all GM45 ROM images. For instance:<br/>
 				$ <b>./ich9macchange XX:XX:XX:XX:XX:XX</b>
 			</p>
 			
@@ -88,8 +90,8 @@
 				Two new files will be created:
 			</p>
 				<ul>
-					<li><b>ich9fdgbe_4m.bin</b>: this is for X200 laptops with the 4MB flash chip.</li>
-					<li><b>ich9fdgbe_8m.bin</b>: this is for X200 laptops with the 8MB flash chip.</li>
+					<li><b>ich9fdgbe_4m.bin</b>: this is for GM45 laptops with the 4MB flash chip.</li>
+					<li><b>ich9fdgbe_8m.bin</b>: this is for GM45 laptops with the 8MB flash chip.</li>
 				</ul>
 				
 			<p>
@@ -100,7 +102,7 @@
 			</p>
 			
 			<p>
-				Assuming that your X200 libreboot image is named <b>libreboot.rom</b>, copy
+				Assuming that your libreboot image is named <b>libreboot.rom</b>, copy
 				the file to where <b>libreboot.rom</b> is located
 				and then run, for instance:<br/>
 				$ <b>dd if=ich9fdgbe_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b><br/>
@@ -109,7 +111,7 @@
 			</p>
 			
 			<p>
-				Your X200 libreboot.rom image is now ready to be flashed on the machine. Refer back to 
+				Your libreboot.rom image is now ready to be flashed on the machine. Refer back to 
 				<a href="../install/index.html#flashrom">../install/index.html#flashrom</a>
 				for how to flash it.
 			</p>
@@ -121,12 +123,13 @@
 		<h1 id="ich9deblob">ICH9 deblob utility</h1>
 		
 			<p>
-				<b>This is no longer strictly necessary. Libreboot ROM images for X200 now
+				<b>This is no longer strictly necessary. Libreboot ROM images for GM45 machines now
 				contain the 12KiB descriptor+gbe generated from ich9gen, by default.</b>
 			</p>
 			
 			<p>
-				This was the tool originally used to disable the ME on X200. <a href="#ich9gen">ich9gen</a> now supersedes it;
+				This was the tool originally used to disable the ME on X200 (later adapted for other machines that use the
+				GM45 chipset). <a href="#ich9gen">ich9gen</a> now supersedes it;
 				ich9gen is better because it does not rely on dumping the factory.rom image (whereas, ich9deblob does).
 			</p>
 		
@@ -146,8 +149,8 @@
 			</p>
 			
 			<p>
-				Place the factory.rom from your X200 
-				(can be obtained using the guide at <a href="../install/x200_external.html">../install/x200_external.html</a>) in
+				Place the factory.rom from your machine 
+				(can be obtained using the external flashing guides for GM45 targets linked <a href="../install/index.html">../install/index.html</a>) in
 				the directory where you have your ich9deblob executable, then run the tool:<br/>
 				$ <b>./ich9deblob</b>
 			</p>
@@ -158,7 +161,7 @@
 			</p>
 			
 			<p>
-				Assuming that your X200 libreboot image is named <b>libreboot.rom</b>, copy
+				Assuming that your libreboot image is named <b>libreboot.rom</b>, copy
 				the <b>deblobbed_descriptor.bin</b> file to where <b>libreboot.rom</b> is located
 				and then run:<br/>
 				$ <b>dd if=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b>
@@ -191,7 +194,7 @@
 	<div class="section">
 		
 		<p>
-			The sections below are adapted from (mostly) IRC logs related to early development getting the ME removed on the X200.
+			The sections below are adapted from (mostly) IRC logs related to early development getting the ME removed on GM45.
 			They are useful for background information. This could not have been done without sgsit's help.
 		</p>
 		
@@ -447,7 +450,7 @@ DD  CC  18  00  11  20  17  00  DD  DD  18  00  12  20  17  00
 			</p>
 				
 			<p>
-				To deblob the x200, you chop out the platform and ME regions and correct the addresses in flReg1-4.
+				To deblob GM45, you chop out the platform and ME regions and correct the addresses in flReg1-4.
 				Then you set meDisable to 1 in ICHSTRAP0 and MCHSTRAP0.
 			</p>
 				
diff --git a/docs/hcl/index.html b/docs/hcl/index.html
index 6aec1c7..4aa74da 100644
--- a/docs/hcl/index.html
+++ b/docs/hcl/index.html
@@ -25,6 +25,7 @@
 				<li><a href="#supported_x60t_list">List of supported ThinkPad X60 Tablets</a></li>
 				<li><a href="#supported_t60_list">List of supported ThinkPad T60s</a></li>
 				<li><a href="x200.html">List of supported ThinkPad X200s</a></li>
+				<li><a href="r400.html">List of supported ThinkPad R400s</a></li>
 				<li><a href="#t60_ati_intel">ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences.</a></li>
 				<li><a href="#macbook11">Information about the Macbook1,1</a></li>
 				<li><a href="#macbook21">Information about the Macbook2,1</a></li>
@@ -46,6 +47,7 @@
 					<li><a href="#supported_x60t_list">Lenovo ThinkPad X60 Tablet</a></li>
 					<li><a href="#supported_t60_list">Lenovo ThinkPad T60</a> (there are exceptions. see link)</li>
 					<li><a href="x200.html">Lenovo ThinkPad X200</a></li>
+					<li><a href="r400.html">Lenovo ThinkPad R400</a></li>
 					<li><a href="#macbook11">Apple MacBook1,1</a></li>
 					<li><a href="#macbook21">Apple MacBook2,1</a></li>
 				</ul>
diff --git a/docs/hcl/r400.html b/docs/hcl/r400.html
new file mode 100644
index 0000000..43dfb09
--- /dev/null
+++ b/docs/hcl/r400.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+	<style type="text/css">
+		@import url('../css/main.css');
+	</style>
+
+	<title>ThinkPad R400</title>
+</head>
+
+<body>
+
+	<div class="section">
+		<h1 id="pagetop">ThinkPad R400</h1>
+			
+			<p</p>
+			
+			<p>
+				It is believed that all R400 laptops are compatible. 
+			</p>
+			
+			<p>
+				There are two possible flash chip sizes for the R400: 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.
+			</p>
+			
+			<p>
+				<b>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 <a href="gm45_remove_me.html">gm45_remove_me.html</a></b> (contains notes, plus
+				instructions)
+			</p>
+
+			<p>
+				Flashing instructions can be found at <a href="../install/index.html#flashrom">../install/index.html#flashrom</a>
+			</p>
+			
+			<p>
+				<a href="index.html">Back to previous index</a>.
+			</p>
+	</div>
+
+	<div class="section">
+
+		<h2 id="compatibility_noblobs">Compatibility (without blobs)</h2>
+
+			<p>
+				Usual limitations apply for native graphics initialization
+				(no VBT and/or INT10H and only GRUB works so no BIOS, so no DOS/Windows support
+				- who cares? There is no system but GNU, and Linux is one of it's kernels).
+			</p>
+
+			<p>
+				When connecting the AC adapter while system is powered off, system will then power on.
+				This probably happens in coreboot aswell (with or without blobs).
+				It's a minor annoyance, but it should be fixed (if it's not already fixed by now).
+			</p>
+
+			<p>
+				This method of disabling the ME leaves the flash descriptor and gbe in place (non-functional data, fully documented)
+				and disables the ME using soft straps. This means that the gigabit ethernet will still work (putting the machine in
+				non-descriptor mode would wipe it out).
+			</p>
+
+			<div class="subsection">
+				<h3 id="hwvirt">Hardware virtualization (vt-x)</h3>
+					<p>
+						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).
+					</p>
+					<p>
+						The following errata datasheet from Intel might help with investigation:
+						<a href="http://download.intel.com/design/mobile/specupdt/320121.pdf">http://download.intel.com/design/mobile/specupdt/320121.pdf</a>
+					</p>
+			</div>
+
+	</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>
+		
+	</div>
+
+</body>
+</html>
diff --git a/docs/hcl/text/r400/r400_dmidecode.txt b/docs/hcl/text/r400/r400_dmidecode.txt
deleted file mode 100644
index 0c0ca2a..0000000
--- a/docs/hcl/text/r400/r400_dmidecode.txt
+++ /dev/null
@@ -1,628 +0,0 @@
-# dmidecode 2.11
-SMBIOS 2.4 present.
-74 structures occupying 2511 bytes.
-Table at 0x000E0010.
-
-Handle 0x0000, DMI type 0, 24 bytes
-BIOS Information
-	Vendor: LENOVO
-	Version: 7UET48WW (1.18 )
-	Release Date: 10/09/2008
-	Address: 0xE0000
-	Runtime Size: 128 kB
-	ROM Size: 8192 kB
-	Characteristics:
-		PCI is supported
-		PC Card (PCMCIA) is supported
-		PNP is supported
-		BIOS is upgradeable
-		BIOS shadowing is allowed
-		ESCD support is available
-		Boot from CD is supported
-		Selectable boot is supported
-		BIOS ROM is socketed
-		EDD is supported
-		ACPI is supported
-		USB legacy is supported
-		BIOS boot specification is supported
-		Targeted content distribution is supported
-	BIOS Revision: 1.24
-	Firmware Revision: 1.1
-
-Handle 0x0001, DMI type 1, 27 bytes
-System Information
-	Manufacturer: LENOVO
-	Product Name: 7439W3Q
-	Version: ThinkPad R400
-	Serial Number: L3ACC2H
-	UUID: 85D49681-4A1D-11CB-B11C-ACDC80D4983E
-	Wake-up Type: Power Switch
-	SKU Number: Not Specified
-	Family: ThinkPad R400
-
-Handle 0x0002, DMI type 2, 8 bytes
-Base Board Information
-	Manufacturer: LENOVO
-	Product Name: 7439W3Q
-	Version: Not Available
-	Serial Number: VF22T89V14J
-
-Handle 0x0003, DMI type 3, 13 bytes
-Chassis Information
-	Manufacturer: LENOVO
-	Type: Notebook
-	Lock: Not Present
-	Version: Not Available
-	Serial Number: Not Available
-	Asset Tag: No Asset Information
-	Boot-up State: Unknown
-	Power Supply State: Unknown
-	Thermal State: Unknown
-	Security Status: Unknown
-
-Handle 0x0004, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0005, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0006, DMI type 4, 35 bytes
-Processor Information
-	Socket Designation: None
-	Type: Central Processor
-	Family: Other
-	Manufacturer: GenuineIntel
-	ID: 76 06 01 00 FF FB EB BF
-	Signature: Type 0, Family 6, Model 23, Stepping 6
-	Flags:
-		FPU (Floating-point unit on-chip)
-		VME (Virtual mode extension)
-		DE (Debugging extension)
-		PSE (Page size extension)
-		TSC (Time stamp counter)
-		MSR (Model specific registers)
-		PAE (Physical address extension)
-		MCE (Machine check exception)
-		CX8 (CMPXCHG8 instruction supported)
-		APIC (On-chip APIC hardware supported)
-		SEP (Fast system call)
-		MTRR (Memory type range registers)
-		PGE (Page global enable)
-		MCA (Machine check architecture)
-		CMOV (Conditional move instruction supported)
-		PAT (Page attribute table)
-		PSE-36 (36-bit page size extension)
-		CLFSH (CLFLUSH instruction supported)
-		DS (Debug store)
-		ACPI (ACPI supported)
-		MMX (MMX technology supported)
-		FXSR (FXSAVE and FXSTOR instructions supported)
-		SSE (Streaming SIMD extensions)
-		SSE2 (Streaming SIMD extensions 2)
-		SS (Self-snoop)
-		HTT (Multi-threading)
-		TM (Thermal monitor supported)
-		PBE (Pending break enabled)
-	Version: Intel(R) Core(TM)2 Duo CPU     P8600  @ 2.40GHz
-	Voltage: 1.2 V
-	External Clock: 266 MHz
-	Max Speed: 2400 MHz
-	Current Speed: 2400 MHz
-	Status: Populated, Enabled
-	Upgrade: None
-	L1 Cache Handle: 0x000A
-	L2 Cache Handle: 0x000C
-	L3 Cache Handle: Not Provided
-	Serial Number: Not Specified
-	Asset Tag: Not Specified
-	Part Number: Not Specified
-
-Handle 0x0007, DMI type 5, 20 bytes
-Memory Controller Information
-	Error Detecting Method: None
-	Error Correcting Capabilities:
-		None
-	Supported Interleave: One-way Interleave
-	Current Interleave: One-way Interleave
-	Maximum Memory Module Size: 4096 MB
-	Maximum Total Memory Size: 8192 MB
-	Supported Speeds:
-		Other
-	Supported Memory Types:
-		DIMM
-		SDRAM
-	Memory Module Voltage: 2.9 V
-	Associated Memory Slots: 2
-		0x0008
-		0x0009
-	Enabled Error Correcting Capabilities:
-		Unknown
-
-Handle 0x0008, DMI type 6, 12 bytes
-Memory Module Information
-	Socket Designation: DIMM Slot 1
-	Bank Connections: 0 1
-	Current Speed: 155 ns
-	Type: DIMM SDRAM
-	Installed Size: 4096 MB (Double-bank Connection)
-	Enabled Size: 4096 MB (Double-bank Connection)
-	Error Status: OK
-
-Handle 0x0009, DMI type 6, 12 bytes
-Memory Module Information
-	Socket Designation: DIMM Slot 2
-	Bank Connections: 2 3
-	Current Speed: 155 ns
-	Type: DIMM SDRAM
-	Installed Size: 4096 MB (Double-bank Connection)
-	Enabled Size: 4096 MB (Double-bank Connection)
-	Error Status: OK
-
-Handle 0x000A, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: Internal L1 Cache
-	Configuration: Enabled, Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 64 kB
-	Maximum Size: 64 kB
-	Supported SRAM Types:
-		Synchronous
-	Installed SRAM Type: Synchronous
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Instruction
-	Associativity: 8-way Set-associative
-
-Handle 0x000B, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: Internal L1 Cache
-	Configuration: Enabled, Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 64 kB
-	Maximum Size: 64 kB
-	Supported SRAM Types:
-		Synchronous
-	Installed SRAM Type: Synchronous
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Data
-	Associativity: 8-way Set-associative
-
-Handle 0x000C, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: Internal L2 Cache
-	Configuration: Enabled, Socketed, Level 2
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 3072 kB
-	Maximum Size: 3072 kB
-	Supported SRAM Types:
-		Burst
-	Installed SRAM Type: Burst
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: 8-way Set-associative
-
-Handle 0x000D, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: External Monitor
-	External Connector Type: DB-15 female
-	Port Type: Video Port
-
-Handle 0x000E, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Microphone Jack
-	External Connector Type: Mini Jack (headphones)
-	Port Type: Audio Port
-
-Handle 0x000F, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Headphone Jack
-	External Connector Type: Mini Jack (headphones)
-	Port Type: Audio Port
-
-Handle 0x0010, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0011, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0012, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Modem
-	External Connector Type: RJ-11
-	Port Type: Modem Port
-
-Handle 0x0013, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: Ethernet
-	External Connector Type: RJ-45
-	Port Type: Network Port
-
-Handle 0x0014, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 1
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0015, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 2
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0016, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: USB 3
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0017, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0018, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x0019, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001A, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001B, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001C, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001D, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001E, DMI type 126, 9 bytes
-Inactive
-
-Handle 0x001F, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: Not Available
-	Internal Connector Type: None
-	External Reference Designator: IEEE1394
-	External Connector Type: IEEE 1394
-	Port Type: Firewire (IEEE P1394)
-
-Handle 0x0020, DMI type 9, 13 bytes
-System Slot Information
-	Designation: ExpressCard Slot 1
-	Type: x1 PCI Express
-	Current Usage: Available
-	Length: Other
-	ID: 0
-	Characteristics:
-		Hot-plug devices are supported
-
-Handle 0x0021, DMI type 9, 13 bytes
-System Slot Information
-	Designation: CardBus Slot 1
-	Type: 32-bit PC Card (PCMCIA)
-	Current Usage: Available
-	Length: Other
-	ID: Adapter 1, Socket 0
-	Characteristics:
-		5.0 V is provided
-		3.3 V is provided
-		PC Card-16 is supported
-		Cardbus is supported
-		Zoom Video is supported
-		Modem ring resume is supported
-		PME signal is supported
-		Hot-plug devices are supported
-
-Handle 0x0022, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0023, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0024, DMI type 9, 13 bytes
-System Slot Information
-	Designation: Media Card Slot 1
-	Type: Other
-	Current Usage: Available
-	Length: Other
-	Characteristics:
-		Hot-plug devices are supported
-
-Handle 0x0025, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0026, DMI type 126, 13 bytes
-Inactive
-
-Handle 0x0027, DMI type 10, 6 bytes
-On Board Device Information
-	Type: Other
-	Status: Enabled
-	Description: IBM Embedded Security hardware
-
-Handle 0x0028, DMI type 11, 5 bytes
-OEM Strings
-	String 1: IBM ThinkPad Embedded Controller -[7VHT12WW-1.01    ]-
-
-Handle 0x0029, DMI type 13, 22 bytes
-BIOS Language Information
-	Language Description Format: Abbreviated
-	Installable Languages: 1
-		enUS
-	Currently Installed Language: enUS
-
-Handle 0x002A, DMI type 15, 25 bytes
-System Event Log
-	Area Length: 0 bytes
-	Header Start Offset: 0x0000
-	Header Length: 16 bytes
-	Data Start Offset: 0x0010
-	Access Method: General-purpose non-volatile data functions
-	Access Address: 0x0000
-	Status: Valid, Not Full
-	Change Token: 0x00000070
-	Header Format: Type 1
-	Supported Log Type Descriptors: 1
-	Descriptor 1: POST error
-	Data Format 1: POST results bitmap
-
-Handle 0x002B, DMI type 16, 15 bytes
-Physical Memory Array
-	Location: System Board Or Motherboard
-	Use: System Memory
-	Error Correction Type: None
-	Maximum Capacity: 4 GB
-	Error Information Handle: Not Provided
-	Number Of Devices: 2
-
-Handle 0x002C, DMI type 17, 27 bytes
-Memory Device
-	Array Handle: 0x002B
-	Error Information Handle: No Error
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 4096 MB
-	Form Factor: SODIMM
-	Set: None
-	Locator: DIMM 1
-	Bank Locator: Bank 0/1
-	Type: DDR2
-	Type Detail: Synchronous
-	Speed: 667 MHz
-	Manufacturer: Not Specified
-	Serial Number: Not Specified
-	Asset Tag: Not Specified
-	Part Number: Not Specified
-
-Handle 0x002D, DMI type 17, 27 bytes
-Memory Device
-	Array Handle: 0x002B
-	Error Information Handle: No Error
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 4096 MB
-	Form Factor: SODIMM
-	Set: None
-	Locator: DIMM 2
-	Bank Locator: Bank 2/3
-	Type: DDR2
-	Type Detail: Synchronous
-	Speed: 667 MHz
-	Manufacturer: Not Specified
-	Serial Number: Not Specified
-	Asset Tag: Not Specified
-	Part Number: Not Specified
-
-Handle 0x002E, DMI type 18, 23 bytes
-32-bit Memory Error Information
-	Type: OK
-	Granularity: Unknown
-	Operation: Unknown
-	Vendor Syndrome: Unknown
-	Memory Array Address: Unknown
-	Device Address: Unknown
-	Resolution: Unknown
-
-Handle 0x002F, DMI type 19, 15 bytes
-Memory Array Mapped Address
-	Starting Address: 0x00000000000
-	Ending Address: 0x001FFFFFFFF
-	Range Size: 8 GB
-	Physical Array Handle: 0x002B
-	Partition Width: 2
-
-Handle 0x0030, DMI type 20, 19 bytes
-Memory Device Mapped Address
-	Starting Address: 0x00000000000
-	Ending Address: 0x000FFFFFFFF
-	Range Size: 4 GB
-	Physical Device Handle: 0x002C
-	Memory Array Mapped Address Handle: 0x002F
-	Partition Row Position: 1
-
-Handle 0x0031, DMI type 20, 19 bytes
-Memory Device Mapped Address
-	Starting Address: 0x00100000000
-	Ending Address: 0x001FFFFFFFF
-	Range Size: 4 GB
-	Physical Device Handle: 0x002D
-	Memory Array Mapped Address Handle: 0x002F
-	Partition Row Position: 1
-
-Handle 0x0032, DMI type 21, 7 bytes
-Built-in Pointing Device
-	Type: Track Point
-	Interface: PS/2
-	Buttons: 3
-
-Handle 0x0033, DMI type 21, 7 bytes
-Built-in Pointing Device
-	Type: Touch Pad
-	Interface: PS/2
-	Buttons: 0
-
-Handle 0x0034, DMI type 22, 26 bytes
-Portable Battery
-	Location: Rear
-	Manufacturer: Panasonic
-	Name: 42T4532
-	Design Capacity: 84240 mWh
-	Design Voltage: 10800 mV
-	SBDS Version: 03.01
-	Maximum Error: Unknown
-	SBDS Serial Number: 02C2
-	SBDS Manufacture Date: 2008-10-15
-	SBDS Chemistry: LION
-	OEM-specific Information: 0x00000000
-
-Handle 0x0035, DMI type 126, 26 bytes
-Inactive
-
-Handle 0x0036, DMI type 24, 5 bytes
-Hardware Security
-	Power-On Password Status: Enabled
-	Keyboard Password Status: Disabled
-	Administrator Password Status: Enabled
-	Front Panel Reset Status: Unknown
-
-Handle 0x0037, DMI type 32, 11 bytes
-System Boot Information
-	Status: No errors detected
-
-Handle 0x0038, DMI type 131, 17 bytes
-OEM-specific Type
-	Header and Data:
-		83 11 38 00 01 02 03 FF FF 1F 00 00 00 00 00 02
-		00
-	Strings:
-		BOOTINF 20h
-		BOOTDEV 21h
-		KEYPTRS 23h
-
-Handle 0x0039, DMI type 131, 22 bytes
-OEM-specific Type
-	Header and Data:
-		83 16 39 00 01 00 00 00 00 00 00 00 00 00 00 00
-		00 00 00 00 00 01
-	Strings:
-		TVT-Enablement
-
-Handle 0x003A, DMI type 132, 7 bytes
-OEM-specific Type
-	Header and Data:
-		84 07 3A 00 02 DA 36
-
-Handle 0x003B, DMI type 133, 5 bytes
-OEM-specific Type
-	Header and Data:
-		85 05 3B 00 01
-	Strings:
-		KHOIHGIUCCHHII
-
-Handle 0x003C, DMI type 134, 13 bytes
-OEM-specific Type
-	Header and Data:
-		86 0D 3C 00 04 11 08 20 00 00 00 00 00
-
-Handle 0x003D, DMI type 134, 16 bytes
-OEM-specific Type
-	Header and Data:
-		86 10 3D 00 00 49 4E 54 43 01 01 00 00 03 01 02
-	Strings:
-		TPM INFO
-		System Reserved
-
-Handle 0x003E, DMI type 135, 13 bytes
-OEM-specific Type
-	Header and Data:
-		87 0D 3E 00 54 50 07 00 01 00 00 00 00
-
-Handle 0x003F, DMI type 135, 18 bytes
-OEM-specific Type
-	Header and Data:
-		87 12 3F 00 54 50 07 01 01 B8 00 00 00 00 00 00
-		00 00
-
-Handle 0x0040, DMI type 135, 35 bytes
-OEM-specific Type
-	Header and Data:
-		87 23 40 00 54 50 07 02 42 41 59 20 49 2F 4F 20
-		01 00 02 00 00 0B 00 48 1C 3E 18 02 00 0B 00 40
-		1C 3A 18
-
-Handle 0x0041, DMI type 135, 34 bytes
-OEM-specific Type
-	Header and Data:
-		87 22 41 00 54 50 07 04 01 06 01 01 02 00 02 01
-		02 00 03 01 02 00 04 01 02 00 05 01 02 00 06 01
-		02 00
-
-Handle 0x0042, DMI type 136, 6 bytes
-OEM-specific Type
-	Header and Data:
-		88 06 42 00 5A 5A
-
-Handle 0x0043, DMI type 126, 28 bytes
-Inactive
-
-Handle 0x0044, DMI type 138, 40 bytes
-OEM-specific Type
-	Header and Data:
-		8A 28 44 00 14 01 02 01 40 02 01 40 02 01 40 02
-		01 40 01 40 42 49 4F 53 20 50 61 73 73 77 6F 72
-		64 20 46 6F 72 6D 61 74
-
-Handle 0x0045, DMI type 139, 37 bytes
-OEM-specific Type
-	Header and Data:
-		8B 25 45 00 11 01 0A 00 00 00 00 00 00 00 00 00
-		00 50 57 4D 53 20 4B 65 79 20 49 6E 66 6F 72 6D
-		61 74 69 6F 6E
-
-Handle 0x0046, DMI type 129, 8 bytes
-OEM-specific Type
-	Header and Data:
-		81 08 46 00 01 01 02 00
-	Strings:
-		Intel_ASF
-		Intel_ASF_001
-
-Handle 0x0047, DMI type 130, 20 bytes
-OEM-specific Type
-	Header and Data:
-		82 14 47 00 24 41 4D 54 01 00 00 00 00 00 00 00
-		00 00 00 00
-
-Handle 0x0048, DMI type 131, 64 bytes
-OEM-specific Type
-	Header and Data:
-		83 40 48 00 3C 00 00 00 00 00 40 2A 0A 00 00 00
-		F8 00 17 29 00 00 00 00 0F 00 00 00 00 00 04 00
-		64 04 03 00 03 00 01 15 C8 00 F5 10 00 00 00 00
-		00 00 00 00 07 00 00 00 76 50 72 6F 00 00 00 00
-
-Handle 0x0049, DMI type 127, 4 bytes
-End Of Table
-
diff --git a/docs/hcl/x200.html b/docs/hcl/x200.html
index 0435efc..da35a1e 100644
--- a/docs/hcl/x200.html
+++ b/docs/hcl/x200.html
@@ -34,7 +34,7 @@
 			
 			<p>
 				<b>The X200 laptops come with the ME (and sometimes AMT in addition) before flashing libreboot. Libreboot disables and removes it
-				by using a modified descriptor: see <a href="x200_remove_me.html">x200_remove_me.html</a></b> (contains notes, plus
+				by using a modified descriptor: see <a href="gm45_remove_me.html">gm45_remove_me.html</a></b> (contains notes, plus
 				instructions)
 			</p>
 
@@ -287,7 +287,7 @@
 		<h2 id="new_targets">New targets</h2>
 
 			<p>
-				ThinkPad R400/R500/T400/T400S/T500/W500. These all use either the GM45 or GS45
+				ThinkPad R500/T400/T400S/T500/W500. These all use either the GM45 or GS45
 				chipset, and should be easy-ish to port to coreboot (based on the X200 port and
 				the GM45 code), then adapted for use in libreboot.
 			</p>
@@ -298,12 +298,6 @@
 				of Intel.
 			</p>
 
-			<p>
-				For example, the R400 currently has issues with raminit (not yet ported to coreboot)
-				where it's DDR3 memory reported as DDR2, as shown in
-				<a href="text/r400/r400_dmidecode.txt">text/r400/r400_dmidecode.txt</a>
-			</p>
-
 	</div>
 
 	<div class="section">
diff --git a/docs/install/images/r400/r400_pomona.jpg b/docs/install/images/r400/r400_pomona.jpg
new file mode 100644
index 0000000..32f3411
--- /dev/null
+++ b/docs/install/images/r400/r400_pomona.jpg
diff --git a/docs/install/index.html b/docs/install/index.html
index 97462fd..b544909 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -38,7 +38,7 @@
 				<li><a href="#rom">Recommended ROMs to flash</a></li>
 				<li><a href="#flashrom_lenovobios">X60/X60S/X60T/T60: How to flash your ROM (if running Lenovo BIOS firmware)</a></li>
 				<li><a href="#flashrom_macbook21">macbook21: How to flash your ROM (if running Apple EFI firmware)</a></li>
-				<li><a href="#flashrom">X60/X60S/X60T/T60/X200/macbook21: How to flash your ROM (if running libreboot or coreboot already)</a></li>
+				<li><a href="#flashrom">X60/X60S/X60T/T60/X200/R400/macbook21: How to flash your ROM (if running libreboot or coreboot already)</a></li>
 			</ul>
 
 		<h2>Installing libreboot (hardware)</h2>
@@ -47,6 +47,7 @@
 				<li><a href="x60tablet_unbrick.html">ThinkPad X60 Tablet: How to unbrick</a></li>
 				<li><a href="t60_unbrick.html">ThinkPad T60: How to unbrick</a></li>
 				<li><a href="x200_external.html">ThinkPad X200: How to unbrick</a> (also the initial installation guide for this machine)</li>
+				<li><a href="r400_external.html">ThinkPad R400: How to unbrick</a> (also the initial installation guide for this machine)</li>
 			</ul>
 			
 	</div>
@@ -77,6 +78,7 @@
 					<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>ThinkPad R400: <b>bin/r400_8mb/</b> (8MiB flash chip) or <b>bin/r400_4mb</b> (4MiB flash chip) (see <a href="../hcl/r400.html">../hcl/r400.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>
@@ -329,7 +331,7 @@
 
 	<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>
+		<h1 id="flashrom">X60/X60S/X60T/T60/X200/R400/macbook21: How to flash the ROMs onto your machine (if running libreboot or coreboot already)</h1>
 
 			<p>
 				<b>
@@ -353,6 +355,11 @@
 			</p>
 			<p>
 				<b>
+					If you have Lenovo BIOS running (R400), go to <a href="r400_external.html">r400_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>
@@ -363,16 +370,17 @@
 			</p>
 			<p>
 				<b>
-					If you have an X200 with libreboot or coreboot already running, note that
+					If you have an X200 or R400 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.
+					<a href="../hcl/gm45_remove_me.html#ich9gen">ich9gen</a> for details.
 					
-					Another important note about the X200: even if you do already have libreboot or coreboot,
+					Another important note about the X200/R400: 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.
+					(see <a href="x200_external.html">x200_external.html</a> or <a href="x200_external.html">x200_external.html</a>)
+					to re-flash those regions. By default,
+					the X200 and R400 ROM images in libreboot contain a descriptor+gbe with all regions unlocked.
 				</b>
 			</p>
 			<p>
diff --git a/docs/install/r400_external.html b/docs/install/r400_external.html
new file mode 100644
index 0000000..ad6e4bd
--- /dev/null
+++ b/docs/install/r400_external.html
@@ -0,0 +1,202 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+	<style type="text/css">
+		@import url('../css/main.css');
+	</style>
+
+	<title>ThinkPad R400: flashing tutorial (BeagleBone Black)</title>
+</head>
+
+<body>
+
+	<div class="section">
+		<h1 id="pagetop">Flashing the R400 with a BeagleBone Black</h1>
+			<p>Initial flashing instructions for X200.</p>
+			<p>
+				This guide is for those who want libreboot on their ThinkPad R400
+				while they still have the original Lenovo BIOS present. This guide
+				can also be followed (adapted) if you brick your R400, to know how
+				to recover.
+			</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><a href="index.html">Back to main index</a></p>
+	</div>
+
+	<div class="section">
+
+		<h1 id="flashchips">Flash chips</h1>
+		
+			<p>
+				There are two possible flash chip sizes for the R400: 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>
+			
+	</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>
+
+			<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)
+===  ethernet jack and VGA port ====
+ NC              -       - 21
+ 1               -       - 17
+ NC              -       - NC
+ NC              -       - NC
+ NC              -       - NC
+ NC              -       - NC
+ 18              -       - 3.3V PSU RED
+ 22              -       - NC - this is pin 1 on the flash chip
+===  SATA port ===
+<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>
+<pre>
+POMONA 5250 (correlate with the BBB guide)
+===  RAM slots ====
+ 18              -       - 1
+ 22              -       - NC
+ NC              -       - 21
+ 3.3V PSU RED    -       - 17 - this is pin 1 on the flash chip. in front of it is the screen.
+===  slot where the AC jack is connected ===
+</pre>
+
+			<h2>
+				Connect Pomona 5252/5250 to the R400 flash chip, and dump/flash
+			</h2>
+				<p>
+					<a href="images/r400/r400_pomona.jpg">images/r400/r400_pomona.jpg</a>
+					shows everything connected. In this picture, the R400 is being flashed
+					with the BBB.
+				</p>
+				<p>
+					No disassembly instructions yet, unfortunately. Check videos online or
+					look at the Hardware Maintenance Manual from Lenovo for this machine.
+					You will need to completely disassemble the machine, removing the motherboard
+					from its metal shell.
+					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
+Calibrating delay loop... OK.
+Found Macronix flash chip &quot;MX25L6405(D)&quot; (8192 kB, SPI) on linux_spi.
+Found Macronix flash chip &quot;MX25L6406E/MX25L6436E&quot; (8192 kB, SPI) on linux_spi.
+Found Macronix flash chip &quot;MX25L6445E/MX25L6473E&quot; (8192 kB, SPI) on linux_spi.
+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/gm45_remove_me.html">../hcl/gm45_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/gm45_remove_me.html#ich9gen">../hcl/gm45_remove_me.html#ich9gen</a> and do what it says to change the MAC address
+					inside your R400 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 R400)
+				</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
+Calibrating delay loop... OK.
+Found Macronix flash chip &quot;MX25L6405(D)&quot; (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.
+</pre>
+				
+			<p>
+				<a href="#pagetop">Back to top of page.</a>
+			</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>
+		
+	</div>
+
+</body>
+</html>
diff --git a/docs/install/x200_external.html b/docs/install/x200_external.html
index e353e24..d4f1a91 100644
--- a/docs/install/x200_external.html
+++ b/docs/install/x200_external.html
@@ -108,7 +108,7 @@ chip on those pins?
 				connected to a BBB.</b>
 				<br/>
 				In this image, a pin header was soldered onto the WSON. Another solution might be to de-solder the WSON-8 chip and put a SOIC-8 there instead.
-				Check the list of SOIC-8 flash chips at <a href="../hcl/x200_remove_me.html#flashchips">../hcl/x200_remove_me.html#flashchips</a> but
+				Check the list of SOIC-8 flash chips at <a href="../hcl/gm45_remove_me.html#flashchips">../hcl/gm45_remove_me.html#flashchips</a> but
 				do note that these are only 4MiB (32Mb) chips. The only X200 SPI chips with 8MiB capacity are SOIC-16. For 8MiB capacity in this case,
 				the X201 SOIC-8 flash chip (Macronix 25L6445E) might work.
 			</p>
@@ -167,10 +167,10 @@ Please specify which chip definition to use with the -c &lt;chipname&gt; option.
 				</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
+					<a href="../hcl/gm45_remove_me.html">../hcl/gm45_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
+					<a href="../hcl/gm45_remove_me.html#ich9gen">../hcl/gm45_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>
diff --git a/docs/release.html b/docs/release.html
index 94c44b7..c686495 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -115,7 +115,13 @@
 						<b>Lenovo ThinkPad X200</b>
 						<ul>
 							<li>X200S and X200 Tablet are also supported, conditionally; see <a href="hcl/x200.html">hcl/x200.html#x200s</a></li>
-							<li><b>ME/AMT</b>: libreboot removes this, permanently. <a href="hcl/x200_remove_me.html">hcl/x200_remove_me.html</a></li>
+							<li><b>ME/AMT</b>: libreboot removes this, permanently. <a href="hcl/gm45_remove_me.html">hcl/gm45_remove_me.html</a></li>
+						</ul>
+					</li>
+					<li>
+						<b>Lenovo ThinkPad R400</b>
+						<ul>
+							<li><b>ME/AMT</b>: libreboot removes this, permanently. <a href="hcl/gm45_remove_me.html">hcl/gm45_remove_me.html</a></li>
 						</ul>
 					</li>
 					<li>