From fe169cfef2bd84d3d2995f3a039282dfe83d94dd Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 9 Feb 2015 01:18:56 +0000
Subject: New board: ThinkPad R400 support added to libreboot.

---
 build                                           |   2 +-
 buildrom-withgrub                               |   6 +-
 docs/archive_old.html                           |   2 +-
 docs/git/index.html                             |  47 +-
 docs/hcl/gm45_remove_me.html                    | 528 ++++++++++++++++++++
 docs/hcl/index.html                             |   2 +
 docs/hcl/r400.html                              | 101 ++++
 docs/hcl/text/r400/r400_dmidecode.txt           | 628 ------------------------
 docs/hcl/x200.html                              |  10 +-
 docs/hcl/x200_remove_me.html                    | 525 --------------------
 docs/install/images/r400/r400_pomona.jpg        | Bin 0 -> 722172 bytes
 docs/install/index.html                         |  22 +-
 docs/install/r400_external.html                 | 202 ++++++++
 docs/install/x200_external.html                 |   6 +-
 docs/release.html                               |   8 +-
 getcb                                           |   5 +
 resources/libreboot/config/macbook21/config     |   8 -
 resources/libreboot/config/qemu_q35_ich9/config |  32 --
 resources/libreboot/config/r400_4mb/config      | 466 ++++++++++++++++++
 resources/libreboot/config/r400_8mb/config      | 466 ++++++++++++++++++
 resources/libreboot/config/t60/config           |   9 +-
 resources/libreboot/config/x200_4mb/config      |   1 +
 resources/libreboot/config/x200_8mb/config      |   9 +-
 resources/libreboot/config/x60/config           |   9 +-
 resources/libreboot/patch/r400.diff             | 105 ++++
 25 files changed, 1957 insertions(+), 1242 deletions(-)
 create mode 100644 docs/hcl/gm45_remove_me.html
 create mode 100644 docs/hcl/r400.html
 delete mode 100644 docs/hcl/text/r400/r400_dmidecode.txt
 delete mode 100644 docs/hcl/x200_remove_me.html
 create mode 100644 docs/install/images/r400/r400_pomona.jpg
 create mode 100644 docs/install/r400_external.html
 create mode 100644 resources/libreboot/config/r400_4mb/config
 create mode 100644 resources/libreboot/config/r400_8mb/config
 create mode 100644 resources/libreboot/patch/r400.diff

diff --git a/build b/build
index de6fba09..ca4ee93f 100755
--- a/build
+++ b/build
@@ -75,7 +75,7 @@ done
 # Then put them in the ROM images.
 cd bin/
 ../resources/utilities/ich9deblob/ich9gen
-for board in "x200"
+for board in "x200" "r400"
 do
 	for romsize in "4m" "8m"
 	do
diff --git a/buildrom-withgrub b/buildrom-withgrub
index 093ff185..01d131ec 100755
--- a/buildrom-withgrub
+++ b/buildrom-withgrub
@@ -50,11 +50,11 @@ fi
 
 for romtype in txtmode vesafb
 do
-	if [ "$1" = "x200_8mb" ] || [ "$1" = "x200_4mb" ]
+	if [ "$1" = "x200_8mb" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "r400_4mb" ]
 		then
 			if [ "$romtype" = "txtmode" ]
 				then
-					echo "Text mode graphics is currently broken on X200. Only framebuffer mode works."
+					echo "Text mode graphics is currently broken on X200 and R400. Only framebuffer mode works."
 					continue
 			fi
 	fi
@@ -72,7 +72,7 @@ do
 	# Add the background image
 	if [ "$romtype" = "vesafb" ]
 	then
-		if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ]
+		if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ]
 		then
 			./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/gnulove.jpg -n background.jpg -t raw
 		else
diff --git a/docs/archive_old.html b/docs/archive_old.html
index 0a21922b..f8f05853 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 cc61384b..02c82795 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/gm45_remove_me.html b/docs/hcl/gm45_remove_me.html
new file mode 100644
index 00000000..d6c36f42
--- /dev/null
+++ b/docs/hcl/gm45_remove_me.html
@@ -0,0 +1,528 @@
+<!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>GM45 chipsets: remove the ME (manageability engine)</title>
+</head>
+
+<body>
+
+	<div class="section">
+		
+		<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
+				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 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
+				this can be found in the ich9deblob/ich9gen source code in resources/utilities/ich9deblob/
+				in libreboot, or more generally on this page.
+			</p>
+			<p>
+				<a href="index.html">Back to previous index</a>.
+			</p>
+			
+	</div>
+
+	<div class="section">
+
+		<h1 id="ich9gen">ICH9 gen utility</h1>
+		
+			<p>
+				<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>
+		
+			<p>
+				It is no longer necessary to use <a href="#ich9deblob">ich9deblob</a> to generate
+				a deblobbed descriptor+gbe image for the X200. ich9gen is a small utility within
+				ich9deblob that can generate them from scratch, without a factory.bin dump.
+			</p>
+			
+			<p>
+				Run:<br/>
+				$ <b>./ich9gen</b>
+			</p>
+			
+			<p>
+				It is also possible to generate a descriptor+gbe image with your own MAC address
+				inside (with the Gbe checksum updated to match). Run:<br/>
+				$ <b>./ich9gen --macaddress XX:XX:XX:XX:XX:XX</b><br/>
+				(replace the XX chars with the hexadecimal chars in the MAC address that you want)
+			</p>
+			
+			<p>
+				You can find out your MAC address from <b>ip addr</b> or <b>ifconfig</b> in GNU/Linux. 
+				Alternatively, if you are running libreboot already (with the correct MAC address in your
+				ROM), dump it (flashrom -r) and read the first 6 bytes from position 0x1000 (or 0x2000) in a hex editor
+				(or, rename it to factory.rom and run it in ich9deblob: in the newly created mkgbe.c
+				will be the individual bytes of your MAC address). If you are currently running the stock firmware
+				and haven't installed libreboot yet, you can also run that through ich9deblob to get the mac address.
+			</p>
+			
+			<p>
+				An even simpler way to get the MAC address would be to read what's on the little sticker on
+				the underside. (on the X200, this would be near the VGA port).
+			</p>
+			
+			<p>
+				A bash script is also included in libreboot which will change the mac address (using ich9gen)
+				on all GM45 ROM images. For instance:<br/>
+				$ <b>./ich9macchange XX:XX:XX:XX:XX:XX</b>
+			</p>
+			
+			<p>
+				Two new files will be created:
+			</p>
+				<ul>
+					<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>
+				ich9gen executables can be found under ./ich9deblob/ statically compiled in
+				libreboot_bin. If you are using src or git, build ich9gen from source with:<br/>
+				$ <b>./builddeps-ich9deblob</b><br/>
+				The executable will appear under resources/utilities/ich9deblob/
+			</p>
+			
+			<p>
+				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/>
+				or:<br/>
+				$ <b>dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b>
+			</p>
+			
+			<p>
+				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>
+			
+	</div>
+
+	<div class="section">
+
+		<h1 id="ich9deblob">ICH9 deblob utility</h1>
+		
+			<p>
+				<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 (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>
+		
+			<p>
+				This is what you will use to generate the deblobbed descriptor+gbe regions for your libreboot ROM image.
+			</p>
+			<p>
+				If you are working with libreboot_src (or git), you can find the source under resources/utilities/ich9deblob/
+				and will already be compiled if you ran ./builddeps or ./builddeps-ich9deblob from the main directory (./), 
+				otherwise you can build it like so:<br/>
+				$ <b>./builddeps-ich9deblob</b><br/>
+				An executable file named <b>ich9deblob</b> will now appear under resources/utilities/ich9deblob/
+			</p>
+			<p>
+				If you are working with libreboot_bin release archive, you can find the utility included, statically compiled
+				(for i686 and x86_64 on GNU/Linux) under ./ich9deblob/.
+			</p>
+			
+			<p>
+				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>
+			<p>
+				A 12kiB file named <b>deblobbed_descriptor.bin</b> will now appear. <b>Keep this and the factory.rom stored in a safe location!</b>
+				The first 4KiB contains the descriptor data region for your machine, and the next 8KiB contains the gbe region (config data for your
+				gigabit NIC). These 2 regions could actually be separate files, but they are joined into 1 file in this case.
+			</p>
+			
+			<p>
+				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>
+			</p>
+			
+			<p>
+				The utility will also generate 4 additional files:
+			</p>
+				<ul>
+					<li>mkdescriptor.c</li>
+					<li>mkdescriptor.h</li>
+					<li>mkgbe.c</li>
+					<li>mkgbe.h</li>
+				</ul>
+			<p>
+				These are C source files that can re-generate the very same Gbe and Descriptor structs
+				(from ich9deblob/ich9gen). To use these, place them in src/ich9gen/ in ich9deblob, then re-build. 
+				The newly built <b>ich9gen</b> executable will be able to re-create the very same 12KiB file from scratch,
+				based on the C structs, this time <b>without</b> the need for a factory.rom dump!
+			</p>
+			
+			<p>
+				You should now have a <b>libreboot.rom</b> image containing the correct 4K descriptor and 8K gbe regions, which
+				will then be safe to flash. Refer back to <a href="../install/index.html#flashrom">../install/index.html#flashrom</a>
+				for how to flash it.
+			</p>
+			
+	</div>
+		
+	<div class="section">
+		
+		<p>
+			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>
+		
+		<div class="subsection">
+			
+			<h2 id="early_notes">Early notes</h2>
+		
+				<ul>
+					<li>
+						<a href="http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-10-family-datasheet.pdf">http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-10-family-datasheet.pdf</a>
+						page 230 mentions about descriptor and non-descriptor mode (which wipes out gbe and ME/AMT).
+					</li>
+					<li>
+						<s><b>See reference to HDA_SDO (disable descriptor security)</b></s> 
+						strap connected GPIO33 pin is it on ICH9-M (X200). HDA_SDO applies to later chipsets (series 6 or higher).
+						Disabling descriptor security also disables the ethernet according to sgsit. sgsit's method
+						involves use of 'soft straps' (see IRC logs below) instead of disabling the descriptor.
+					</li>
+					<li>
+						<b>and the location of GPIO33 on the x200s: (was an external link. Putting it here instead)</b>
+						<a href="images/x200/gpio33_location.jpg">images/x200/gpio33_location.jpg</a>
+						- it's above the number 7 on TP37 (which is above the big intel chip at the bottom)
+					</li>
+					<li>
+						The ME datasheet may not be for the mobile chipsets but it doesn't vary that much. 
+						This one gives some detail and covers QM67 which is what the X201 uses: 
+						<a href="http://www.intel.co.uk/content/dam/www/public/us/en/documents/datasheets/6-chipset-c200-chipset-datasheet.pdf">http://www.intel.co.uk/content/dam/www/public/us/en/documents/datasheets/6-chipset-c200-chipset-datasheet.pdf</a>
+					</li>
+				</ul>
+		
+		</div>
+		
+	</div>
+		
+	<div class="section">
+
+		<div class="subsection">
+
+			<h2 id="flashchips">Flash chips</h2>
+			
+				<ul>
+					<li>
+						Schematics for X200 laptop: <a href="http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006075.pdf">http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006075.pdf</a>
+						<b><s>- Page 20 and page 9 refer to SDA_HDO or SDA_HDOUT</s></b> only on series 6 or higher chipsets. ICH9-M (X200) does it with a strap connected to GPIO33 pin (see IRC notes below)<br/>
+						- According to page 29, the X200 can have any of the following flash chips:
+						<ul>
+							<li>ATMEL AT26DF321-SU 72.26321.A01 - this is a 32Mb (4MiB) chip</li>
+							<li>MXIC (Macronix?) MX25L3205DM2I-12G 72.25325.A01 - another 32Mb (4MiB) chip</li>
+							<li>MXIC (Macronix?) MX25L6405DMI-12G 41R0820AA - this is a 64Mb (8MiB) chip</li>
+							<li>Winbond W25X64VSFIG 41R0820BA - another 64Mb (8MiB) chip</li>
+						</ul>
+						sgsit says that the X200s with the 64Mb flash chips are (probably) the ones with AMT (alongside the ME), whereas
+						the 32Mb chips contain only the ME.
+					</li>
+					<li>
+						Schematics for X200s laptop: <a href="http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006104.pdf">http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006104.pdf</a>.
+					</li>
+				</ul>
+		
+		</div>
+		
+	</div>
+		
+	<div class="section">
+		
+		<h2 id="early_development_notes">Early development notes</h2>
+				
+<pre>
+<i>
+Start (hex)	End (hex)	Length (hex)	Area Name
+-----------	---------	------------	---------
+00000000	003FFFFF	00400000	Flash Image
+
+00000000	00000FFF	00001000	Descriptor Region
+00000004	0000000F	0000000C		Descriptor Map
+00000010	0000001B	0000000C		Component Section
+00000040	0000004F	00000010		Region Section
+00000060	0000006B	0000000C		Master Access Section
+00000060	00000063	00000004			CPU/BIOS
+00000064	00000067	00000004			Manageability Engine (ME)
+00000068	0000006B	00000004			GbE LAN
+00000100	00000103	00000004		ICH Strap 0
+00000104	00000107	00000004		ICH Strap 1
+00000200	00000203	00000004		MCH Strap 0
+00000EFC	00000EFF	00000004		Descriptor Map 2
+00000ED0	00000EF7	00000028		ME VSCC Table
+00000ED0	00000ED7	00000008			Flash device 1
+00000ED8	00000EDF	00000008			Flash device 2
+00000EE0	00000EE7	00000008			Flash device 3
+00000EE8	00000EEF	00000008			Flash device 4
+00000EF0	00000EF7	00000008			Flash device 5
+00000F00	00000FFF	00000100		OEM Section
+00001000	001F5FFF	001F5000	ME Region
+001F6000	001F7FFF	00002000	GbE Region
+001F8000	001FFFFF	00008000	PDR Region
+00200000	003FFFFF	00200000	BIOS Region
+
+Start (hex)	End (hex)	Length (hex)	Area Name
+-----------	---------	------------	---------
+00000000	003FFFFF	00400000	Flash Image
+
+00000000	00000FFF	00001000	Descriptor Region
+00000004	0000000F	0000000C		Descriptor Map
+00000010	0000001B	0000000C		Component Section
+00000040	0000004F	00000010		Region Section
+00000060	0000006B	0000000C		Master Access Section
+00000060	00000063	00000004			CPU/BIOS
+00000064	00000067	00000004			Manageability Engine (ME)
+00000068	0000006B	00000004			GbE LAN
+00000100	00000103	00000004		ICH Strap 0
+00000104	00000107	00000004		ICH Strap 1
+00000200	00000203	00000004		MCH Strap 0
+00000ED0	00000EF7	00000028		ME VSCC Table
+00000ED0	00000ED7	00000008			Flash device 1
+00000ED8	00000EDF	00000008			Flash device 2
+00000EE0	00000EE7	00000008			Flash device 3
+00000EE8	00000EEF	00000008			Flash device 4
+00000EF0	00000EF7	00000008			Flash device 5
+00000EFC	00000EFF	00000004		Descriptor Map 2
+00000F00	00000FFF	00000100		OEM Section
+00001000	00002FFF	00002000	GbE Region
+00003000	00202FFF	00200000	BIOS Region
+
+Build Settings
+--------------
+Flash Erase Size = 0x1000
+
+</i>
+</pre>
+
+			<p>
+				It's a utility called 'Flash Image Tool' for ME 4.x that was used for this. You drag a complete
+				image into in and the utility decomposes the various components, allowing you to set soft straps.
+			</p>
+			<p>
+				This tool is proprietary, for Windows only, but was used to deblob the X200. End justified means, and
+				the utility is no longer needed since the ich9deblob utility (documented on this page) can now be
+				used to create deblobbed descriptors.
+			</p>
+
+	</div>
+
+	<div class="section">
+		
+		<h2 id="gbe_region">
+			GBE (gigabit ethernet) region in SPI flash
+		</h2>
+
+			<p>
+				Of the 8K, about 95% is 0xFF. 
+				The data is the gbe region is fully documented in this public datasheet:
+				<a href="http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf">http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf</a>
+			</p>
+
+			<p>
+				The only actual content found was:
+			</p>
+
+<pre>
+<i>
+00  1F  1F  1F  1F  1F  00  08  FF  FF  83  10  FF  FF  FF  FF  
+08  10  FF  FF  C3  10  EE  20  AA  17  F5  10  86  80  00  00  
+01  0D  00  00  00  00  05  06  20  30  00  0A  00  00  8B  8D  
+02  06  40  2B  43  00  00  00  F5  10  AD  BA  F5  10  BF  10  
+AD  BA  CB  10  AD  BA  AD  BA  00  00  00  00  00  00  00  00  
+00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  
+00  01  00  40  28  12  07  40  FF  FF  FF  FF  FF  FF  FF  FF  
+FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  D9  F0  
+20  60  1F  00  02  00  13  00  00  80  1D  00  FF  00  16  00  
+DD  CC  18  00  11  20  17  00  DD  DD  18  00  12  20  17  00  
+00  80  1D  00  00  00  1F  
+</i>
+</pre>
+
+		<p>
+			The first part is the MAC address set to all 0x1F. It's repeated haly way through
+			the 8K area, and the rest is all 0xFF. This is all documented in the datasheet.
+		</p>
+		
+		<p>
+			The GBe region starts at 0x20A000 bytes from the *end* of a factory image and is 0x2000 bytes long.
+			In libreboot (deblobbed) the descriptor is set to put gbe directly after the initial 4K flash descriptor. 
+			So the first 4K of the ROM is the descriptor, and then the next 8K is the gbe region.
+		</p>
+
+		<div class="subsection">
+			
+			<h3 id="gbe_region_changemacaddress">GBE region: change MAC address</h3>
+
+				<p>
+					According to the datasheet, it's supposed to add up to 0xBABA but can actually be others on the X200.
+					<a href="https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums">https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums</a>
+				</p>
+				<p>
+					<i>&quot;One of those engineers loves classic rock music, so he selected 0xBABA&quot;</i>
+				</p>
+				<p>In honour of the song <i>Baba O'Reilly</i> by <i>The Who</i> apparently. We're not making this stuff up...</p>
+
+				<p>
+					0x3ABA, 0x34BA, 0x40BA and more have been observed in the main Gbe regions on the X200 factory.rom dumps.
+					The checksums of the backup regions match BABA, however. 
+				</p>
+				
+				<p>
+					By default, the X200 (as shipped by Lenovo) actually has an invalid main gbe checksum. The backup gbe region is correct,
+					and is what these machines default to. Basically, you should do what you need on the *backup* gbe region, and
+					then correct the main one by copying from the backup.
+				</p>
+				
+				<p>
+					Look at resources/utilities/ich9deblob/ich9deblob.c.
+				</p>
+					<ul>
+						<li>Add the first 0x3F 16bit numbers (unsigned) of the GBe descriptor together (this includes the checksum value)
+						and that has to add up to 0xBABA. In other words, the checksum is 0xBABA minus the total of the first
+						0x3E 16bit numbers (unsigned), ignoring any overflow.</li>
+					</ul>
+					
+		</div>
+		
+	</div>
+
+	<div class="section">
+		
+		<h2 id="flash_descriptor_region">Flash descriptor region</h2>
+			
+			<p>
+				<a href="http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf">http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf</a>
+				from page 850 onwards. This explains everything that is in the flash descriptor, which can be used to understand what libreboot
+				is doing about modifying it.
+			</p>
+				
+			<p>
+				How to deblob:
+			</p>
+				<ul>
+					<li>patch the number of regions present in the descriptor from 5 - 3</li>
+					<li>originally descriptor + bios + me + gbe + platform</li>
+					<li>modified = descriptor + bios + gbe</li>
+					<li>the next stage is to patch the part of the descriptor which defines the start and end point of each section</li>
+					<li>then cut out the gbe region and insert it just after the region</li>
+					<li>all this can be substantiated with public docs (ICH9 datasheet)</li>
+					<li>the final part is flipping 2 bits. Halting the ME via 1 MCH soft strap and 1 ICH soft strap</li>
+					<li>the part of the descriptor described there gives the base address and length of each region (bits 12:24 of each address)</li>
+					<li>to disable a region, you set the base address to 0xFFF and the length to 0</li>
+					<li>and you change the number of regions from 4 (zero based) to 2</li>
+				</ul>
+				
+			<p>
+				There's an interesting parameter called 'ME Alternate disable', which allows the ME to only handle hardware errata in the southbridge,
+				but disables any other functionality. This is similar to the 'ignition' in the 5 series and higher but using the standard firmware
+				instead of a small 128K version. Useless for libreboot, though.
+			</p>
+				
+			<p>
+				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>
+				
+			<p>How to patch the descriptor from the factory.rom dump</p>
+				<ul>
+					<li>map the first 4k into the struct (minus the gbe region)</li>
+					<li>set NR in FLMAP0 to 2 (from 4)</li>
+					<li>adjust BASE and LIMIT in flReg1,2,3,4 to reflect the new location of each region (or remove them in the case of Platform and ME)</li>
+					<li>set meDisable to 1/true in ICHSTRAP0 and MCHSTRAP0</li>
+					<li>extract the 8k GBe region and append that to the end of the 4k descriptor</li>
+					<li>output the 12k concatenated chunk</li>
+					<li>Then it can be dd'd into the first 12K part of a coreboot image.</li>
+					<li>the GBe region always starts 0x20A000 bytes from the end of the ROM</li>
+				</ul>
+					
+			<p>
+				This means that libreboot's descriptor region will simply define the following regions:
+			</p>
+				<ul>
+					<li>descriptor (4K)</li>
+					<li>gbe (8K)</li>
+					<li>bios (rest of flash chip. CBFS also set to occupy this whole size)</li>
+				</ul>
+
+			<p>
+				The data in the descriptor region is little endian, and it represents bits 24:12 of the address
+				(bits 12-24, written this way since bit 24 is nearer to left than bit 12 in the binary representation).
+			</p>
+			<p>
+				So, <i>x &lt;&lt; 12 = address</i>
+			</p>
+			<p>
+				If it's in descriptor mode, then the first 4 bytes will be 5A A5 F0 0F.
+			</p>
+				
+	</div>
+		
+		
+	<div class="section">
+		
+		<h2 id="platform_data_region">platform data partition in boot flash (factory.rom / lenovo bios)</h2>
+			
+			<p>
+				Basically useless for libreboot, since it appears to be a blob.
+				Removing it didn't cause any issues in libreboot.
+			</p>
+			<p>
+				This is a 32K region from the factory image. It could be data
+				(non-functional) that the original Lenovo BIOS used, but we don't know.
+			</p>
+		
+			<p>
+				It has only a 448 byte fragment different from 0x00 or 0xFF.
+			</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/hcl/index.html b/docs/hcl/index.html
index 6aec1c70..4aa74da8 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 00000000..43dfb096
--- /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 0c0ca2a9..00000000
--- 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 0435efce..da35a1ec 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/hcl/x200_remove_me.html b/docs/hcl/x200_remove_me.html
deleted file mode 100644
index ae0a83f7..00000000
--- a/docs/hcl/x200_remove_me.html
+++ /dev/null
@@ -1,525 +0,0 @@
-<!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 X200: remove the ME (manageability engine)</title>
-</head>
-
-<body>
-
-	<div class="section">
-		
-		<h1 id="pagetop">ThinkPad X200: 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.
-			</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). 
-			</p>
-			<p>
-				The ME is removed and disabled in libreboot by modifying the descriptor. More info about
-				this can be found in the ich9deblob/ich9gen source code in resources/utilities/ich9deblob/
-				in libreboot, or more generally on this page.
-			</p>
-			<p>
-				<a href="x200.html">Back to main X200 compatibility page (x200.html)</a>.
-			</p>
-			
-	</div>
-
-	<div class="section">
-
-		<h1 id="ich9gen">ICH9 gen utility</h1>
-		
-			<p>
-				<b>This is no longer strictly necessary. Libreboot ROM images for X200 now
-				contain the 12KiB descriptor+gbe generated from ich9gen, by default.</b>
-			</p>
-		
-			<p>
-				It is no longer necessary to use <a href="#ich9deblob">ich9deblob</a> to generate
-				a deblobbed descriptor+gbe image for the X200. ich9gen is a small utility within
-				ich9deblob that can generate them from scratch, without a factory.bin dump.
-			</p>
-			
-			<p>
-				Run:<br/>
-				$ <b>./ich9gen</b>
-			</p>
-			
-			<p>
-				It is also possible to generate a descriptor+gbe image with your own MAC address
-				inside (with the Gbe checksum updated to match). Run:<br/>
-				$ <b>./ich9gen --macaddress XX:XX:XX:XX:XX:XX</b><br/>
-				(replace the XX chars with the hexadecimal chars in the MAC address that you want)
-			</p>
-			
-			<p>
-				You can find out your MAC address from <b>ip addr</b> or <b>ifconfig</b> in GNU/Linux. 
-				Alternatively, if you are running libreboot already (with the correct MAC address in your
-				ROM), dump it (flashrom -r) and read the first 6 bytes from position 0x1000 (or 0x2000) in a hex editor
-				(or, rename it to factory.rom and run it in ich9deblob: in the newly created mkgbe.c
-				will be the individual bytes of your MAC address). If you are currently running the stock firmware
-				and haven't installed libreboot yet, you can also run that through ich9deblob to get the mac address.
-			</p>
-			
-			<p>
-				An even simpler way to get the MAC address would be to read what's on the little sticker on
-				the underside. (on the X200, this would be near the VGA port).
-			</p>
-			
-			<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/>
-				$ <b>./ich9macchange XX:XX:XX:XX:XX:XX</b>
-			</p>
-			
-			<p>
-				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>
-				</ul>
-				
-			<p>
-				ich9gen executables can be found under ./ich9deblob/ statically compiled in
-				libreboot_bin. If you are using src or git, build ich9gen from source with:<br/>
-				$ <b>./builddeps-ich9deblob</b><br/>
-				The executable will appear under resources/utilities/ich9deblob/
-			</p>
-			
-			<p>
-				Assuming that your X200 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/>
-				or:<br/>
-				$ <b>dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b>
-			</p>
-			
-			<p>
-				Your X200 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>
-			
-	</div>
-
-	<div class="section">
-
-		<h1 id="ich9deblob">ICH9 deblob utility</h1>
-		
-			<p>
-				<b>This is no longer strictly necessary. Libreboot ROM images for X200 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;
-				ich9gen is better because it does not rely on dumping the factory.rom image (whereas, ich9deblob does).
-			</p>
-		
-			<p>
-				This is what you will use to generate the deblobbed descriptor+gbe regions for your libreboot ROM image.
-			</p>
-			<p>
-				If you are working with libreboot_src (or git), you can find the source under resources/utilities/ich9deblob/
-				and will already be compiled if you ran ./builddeps or ./builddeps-ich9deblob from the main directory (./), 
-				otherwise you can build it like so:<br/>
-				$ <b>./builddeps-ich9deblob</b><br/>
-				An executable file named <b>ich9deblob</b> will now appear under resources/utilities/ich9deblob/
-			</p>
-			<p>
-				If you are working with libreboot_bin release archive, you can find the utility included, statically compiled
-				(for i686 and x86_64 on GNU/Linux) under ./ich9deblob/.
-			</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
-				the directory where you have your ich9deblob executable, then run the tool:<br/>
-				$ <b>./ich9deblob</b>
-			</p>
-			<p>
-				A 12kiB file named <b>deblobbed_descriptor.bin</b> will now appear. <b>Keep this and the factory.rom stored in a safe location!</b>
-				The first 4KiB contains the descriptor data region for your machine, and the next 8KiB contains the gbe region (config data for your
-				gigabit NIC). These 2 regions could actually be separate files, but they are joined into 1 file in this case.
-			</p>
-			
-			<p>
-				Assuming that your X200 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>
-			</p>
-			
-			<p>
-				The utility will also generate 4 additional files:
-			</p>
-				<ul>
-					<li>mkdescriptor.c</li>
-					<li>mkdescriptor.h</li>
-					<li>mkgbe.c</li>
-					<li>mkgbe.h</li>
-				</ul>
-			<p>
-				These are C source files that can re-generate the very same Gbe and Descriptor structs
-				(from ich9deblob/ich9gen). To use these, place them in src/ich9gen/ in ich9deblob, then re-build. 
-				The newly built <b>ich9gen</b> executable will be able to re-create the very same 12KiB file from scratch,
-				based on the C structs, this time <b>without</b> the need for a factory.rom dump!
-			</p>
-			
-			<p>
-				You should now have a <b>libreboot.rom</b> image containing the correct 4K descriptor and 8K gbe regions, which
-				will then be safe to flash. Refer back to <a href="../install/index.html#flashrom">../install/index.html#flashrom</a>
-				for how to flash it.
-			</p>
-			
-	</div>
-		
-	<div class="section">
-		
-		<p>
-			The sections below are adapted from (mostly) IRC logs related to early development getting the ME removed on the X200.
-			They are useful for background information. This could not have been done without sgsit's help.
-		</p>
-		
-		<div class="subsection">
-			
-			<h2 id="early_notes">Early notes</h2>
-		
-				<ul>
-					<li>
-						<a href="http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-10-family-datasheet.pdf">http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-10-family-datasheet.pdf</a>
-						page 230 mentions about descriptor and non-descriptor mode (which wipes out gbe and ME/AMT).
-					</li>
-					<li>
-						<s><b>See reference to HDA_SDO (disable descriptor security)</b></s> 
-						strap connected GPIO33 pin is it on ICH9-M (X200). HDA_SDO applies to later chipsets (series 6 or higher).
-						Disabling descriptor security also disables the ethernet according to sgsit. sgsit's method
-						involves use of 'soft straps' (see IRC logs below) instead of disabling the descriptor.
-					</li>
-					<li>
-						<b>and the location of GPIO33 on the x200s: (was an external link. Putting it here instead)</b>
-						<a href="images/x200/gpio33_location.jpg">images/x200/gpio33_location.jpg</a>
-						- it's above the number 7 on TP37 (which is above the big intel chip at the bottom)
-					</li>
-					<li>
-						The ME datasheet may not be for the mobile chipsets but it doesn't vary that much. 
-						This one gives some detail and covers QM67 which is what the X201 uses: 
-						<a href="http://www.intel.co.uk/content/dam/www/public/us/en/documents/datasheets/6-chipset-c200-chipset-datasheet.pdf">http://www.intel.co.uk/content/dam/www/public/us/en/documents/datasheets/6-chipset-c200-chipset-datasheet.pdf</a>
-					</li>
-				</ul>
-		
-		</div>
-		
-	</div>
-		
-	<div class="section">
-
-		<div class="subsection">
-
-			<h2 id="flashchips">Flash chips</h2>
-			
-				<ul>
-					<li>
-						Schematics for X200 laptop: <a href="http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006075.pdf">http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006075.pdf</a>
-						<b><s>- Page 20 and page 9 refer to SDA_HDO or SDA_HDOUT</s></b> only on series 6 or higher chipsets. ICH9-M (X200) does it with a strap connected to GPIO33 pin (see IRC notes below)<br/>
-						- According to page 29, the X200 can have any of the following flash chips:
-						<ul>
-							<li>ATMEL AT26DF321-SU 72.26321.A01 - this is a 32Mb (4MiB) chip</li>
-							<li>MXIC (Macronix?) MX25L3205DM2I-12G 72.25325.A01 - another 32Mb (4MiB) chip</li>
-							<li>MXIC (Macronix?) MX25L6405DMI-12G 41R0820AA - this is a 64Mb (8MiB) chip</li>
-							<li>Winbond W25X64VSFIG 41R0820BA - another 64Mb (8MiB) chip</li>
-						</ul>
-						sgsit says that the X200s with the 64Mb flash chips are (probably) the ones with AMT (alongside the ME), whereas
-						the 32Mb chips contain only the ME.
-					</li>
-					<li>
-						Schematics for X200s laptop: <a href="http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006104.pdf">http://pdf.datasheetarchive.com/indexerfiles/Datasheets-USER/DSAUPLD00006104.pdf</a>.
-					</li>
-				</ul>
-		
-		</div>
-		
-	</div>
-		
-	<div class="section">
-		
-		<h2 id="early_development_notes">Early development notes</h2>
-				
-<pre>
-<i>
-Start (hex)	End (hex)	Length (hex)	Area Name
------------	---------	------------	---------
-00000000	003FFFFF	00400000	Flash Image
-
-00000000	00000FFF	00001000	Descriptor Region
-00000004	0000000F	0000000C		Descriptor Map
-00000010	0000001B	0000000C		Component Section
-00000040	0000004F	00000010		Region Section
-00000060	0000006B	0000000C		Master Access Section
-00000060	00000063	00000004			CPU/BIOS
-00000064	00000067	00000004			Manageability Engine (ME)
-00000068	0000006B	00000004			GbE LAN
-00000100	00000103	00000004		ICH Strap 0
-00000104	00000107	00000004		ICH Strap 1
-00000200	00000203	00000004		MCH Strap 0
-00000EFC	00000EFF	00000004		Descriptor Map 2
-00000ED0	00000EF7	00000028		ME VSCC Table
-00000ED0	00000ED7	00000008			Flash device 1
-00000ED8	00000EDF	00000008			Flash device 2
-00000EE0	00000EE7	00000008			Flash device 3
-00000EE8	00000EEF	00000008			Flash device 4
-00000EF0	00000EF7	00000008			Flash device 5
-00000F00	00000FFF	00000100		OEM Section
-00001000	001F5FFF	001F5000	ME Region
-001F6000	001F7FFF	00002000	GbE Region
-001F8000	001FFFFF	00008000	PDR Region
-00200000	003FFFFF	00200000	BIOS Region
-
-Start (hex)	End (hex)	Length (hex)	Area Name
------------	---------	------------	---------
-00000000	003FFFFF	00400000	Flash Image
-
-00000000	00000FFF	00001000	Descriptor Region
-00000004	0000000F	0000000C		Descriptor Map
-00000010	0000001B	0000000C		Component Section
-00000040	0000004F	00000010		Region Section
-00000060	0000006B	0000000C		Master Access Section
-00000060	00000063	00000004			CPU/BIOS
-00000064	00000067	00000004			Manageability Engine (ME)
-00000068	0000006B	00000004			GbE LAN
-00000100	00000103	00000004		ICH Strap 0
-00000104	00000107	00000004		ICH Strap 1
-00000200	00000203	00000004		MCH Strap 0
-00000ED0	00000EF7	00000028		ME VSCC Table
-00000ED0	00000ED7	00000008			Flash device 1
-00000ED8	00000EDF	00000008			Flash device 2
-00000EE0	00000EE7	00000008			Flash device 3
-00000EE8	00000EEF	00000008			Flash device 4
-00000EF0	00000EF7	00000008			Flash device 5
-00000EFC	00000EFF	00000004		Descriptor Map 2
-00000F00	00000FFF	00000100		OEM Section
-00001000	00002FFF	00002000	GbE Region
-00003000	00202FFF	00200000	BIOS Region
-
-Build Settings
---------------
-Flash Erase Size = 0x1000
-
-</i>
-</pre>
-
-			<p>
-				It's a utility called 'Flash Image Tool' for ME 4.x that was used for this. You drag a complete
-				image into in and the utility decomposes the various components, allowing you to set soft straps.
-			</p>
-			<p>
-				This tool is proprietary, for Windows only, but was used to deblob the X200. End justified means, and
-				the utility is no longer needed since the ich9deblob utility (documented on this page) can now be
-				used to create deblobbed descriptors.
-			</p>
-
-	</div>
-
-	<div class="section">
-		
-		<h2 id="gbe_region">
-			GBE (gigabit ethernet) region in SPI flash
-		</h2>
-
-			<p>
-				Of the 8K, about 95% is 0xFF. 
-				The data is the gbe region is fully documented in this public datasheet:
-				<a href="http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf">http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf</a>
-			</p>
-
-			<p>
-				The only actual content found was:
-			</p>
-
-<pre>
-<i>
-00  1F  1F  1F  1F  1F  00  08  FF  FF  83  10  FF  FF  FF  FF  
-08  10  FF  FF  C3  10  EE  20  AA  17  F5  10  86  80  00  00  
-01  0D  00  00  00  00  05  06  20  30  00  0A  00  00  8B  8D  
-02  06  40  2B  43  00  00  00  F5  10  AD  BA  F5  10  BF  10  
-AD  BA  CB  10  AD  BA  AD  BA  00  00  00  00  00  00  00  00  
-00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  
-00  01  00  40  28  12  07  40  FF  FF  FF  FF  FF  FF  FF  FF  
-FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  FF  D9  F0  
-20  60  1F  00  02  00  13  00  00  80  1D  00  FF  00  16  00  
-DD  CC  18  00  11  20  17  00  DD  DD  18  00  12  20  17  00  
-00  80  1D  00  00  00  1F  
-</i>
-</pre>
-
-		<p>
-			The first part is the MAC address set to all 0x1F. It's repeated haly way through
-			the 8K area, and the rest is all 0xFF. This is all documented in the datasheet.
-		</p>
-		
-		<p>
-			The GBe region starts at 0x20A000 bytes from the *end* of a factory image and is 0x2000 bytes long.
-			In libreboot (deblobbed) the descriptor is set to put gbe directly after the initial 4K flash descriptor. 
-			So the first 4K of the ROM is the descriptor, and then the next 8K is the gbe region.
-		</p>
-
-		<div class="subsection">
-			
-			<h3 id="gbe_region_changemacaddress">GBE region: change MAC address</h3>
-
-				<p>
-					According to the datasheet, it's supposed to add up to 0xBABA but can actually be others on the X200.
-					<a href="https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums">https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums</a>
-				</p>
-				<p>
-					<i>&quot;One of those engineers loves classic rock music, so he selected 0xBABA&quot;</i>
-				</p>
-				<p>In honour of the song <i>Baba O'Reilly</i> by <i>The Who</i> apparently. We're not making this stuff up...</p>
-
-				<p>
-					0x3ABA, 0x34BA, 0x40BA and more have been observed in the main Gbe regions on the X200 factory.rom dumps.
-					The checksums of the backup regions match BABA, however. 
-				</p>
-				
-				<p>
-					By default, the X200 (as shipped by Lenovo) actually has an invalid main gbe checksum. The backup gbe region is correct,
-					and is what these machines default to. Basically, you should do what you need on the *backup* gbe region, and
-					then correct the main one by copying from the backup.
-				</p>
-				
-				<p>
-					Look at resources/utilities/ich9deblob/ich9deblob.c.
-				</p>
-					<ul>
-						<li>Add the first 0x3F 16bit numbers (unsigned) of the GBe descriptor together (this includes the checksum value)
-						and that has to add up to 0xBABA. In other words, the checksum is 0xBABA minus the total of the first
-						0x3E 16bit numbers (unsigned), ignoring any overflow.</li>
-					</ul>
-					
-		</div>
-		
-	</div>
-
-	<div class="section">
-		
-		<h2 id="flash_descriptor_region">Flash descriptor region</h2>
-			
-			<p>
-				<a href="http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf">http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf</a>
-				from page 850 onwards. This explains everything that is in the flash descriptor, which can be used to understand what libreboot
-				is doing about modifying it.
-			</p>
-				
-			<p>
-				How to deblob:
-			</p>
-				<ul>
-					<li>patch the number of regions present in the descriptor from 5 - 3</li>
-					<li>originally descriptor + bios + me + gbe + platform</li>
-					<li>modified = descriptor + bios + gbe</li>
-					<li>the next stage is to patch the part of the descriptor which defines the start and end point of each section</li>
-					<li>then cut out the gbe region and insert it just after the region</li>
-					<li>all this can be substantiated with public docs (ICH9 datasheet)</li>
-					<li>the final part is flipping 2 bits. Halting the ME via 1 MCH soft strap and 1 ICH soft strap</li>
-					<li>the part of the descriptor described there gives the base address and length of each region (bits 12:24 of each address)</li>
-					<li>to disable a region, you set the base address to 0xFFF and the length to 0</li>
-					<li>and you change the number of regions from 4 (zero based) to 2</li>
-				</ul>
-				
-			<p>
-				There's an interesting parameter called 'ME Alternate disable', which allows the ME to only handle hardware errata in the southbridge,
-				but disables any other functionality. This is similar to the 'ignition' in the 5 series and higher but using the standard firmware
-				instead of a small 128K version. Useless for libreboot, though.
-			</p>
-				
-			<p>
-				To deblob the x200, 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>
-				
-			<p>How to patch the descriptor from the factory.rom dump</p>
-				<ul>
-					<li>map the first 4k into the struct (minus the gbe region)</li>
-					<li>set NR in FLMAP0 to 2 (from 4)</li>
-					<li>adjust BASE and LIMIT in flReg1,2,3,4 to reflect the new location of each region (or remove them in the case of Platform and ME)</li>
-					<li>set meDisable to 1/true in ICHSTRAP0 and MCHSTRAP0</li>
-					<li>extract the 8k GBe region and append that to the end of the 4k descriptor</li>
-					<li>output the 12k concatenated chunk</li>
-					<li>Then it can be dd'd into the first 12K part of a coreboot image.</li>
-					<li>the GBe region always starts 0x20A000 bytes from the end of the ROM</li>
-				</ul>
-					
-			<p>
-				This means that libreboot's descriptor region will simply define the following regions:
-			</p>
-				<ul>
-					<li>descriptor (4K)</li>
-					<li>gbe (8K)</li>
-					<li>bios (rest of flash chip. CBFS also set to occupy this whole size)</li>
-				</ul>
-
-			<p>
-				The data in the descriptor region is little endian, and it represents bits 24:12 of the address
-				(bits 12-24, written this way since bit 24 is nearer to left than bit 12 in the binary representation).
-			</p>
-			<p>
-				So, <i>x &lt;&lt; 12 = address</i>
-			</p>
-			<p>
-				If it's in descriptor mode, then the first 4 bytes will be 5A A5 F0 0F.
-			</p>
-				
-	</div>
-		
-		
-	<div class="section">
-		
-		<h2 id="platform_data_region">platform data partition in boot flash (factory.rom / lenovo bios)</h2>
-			
-			<p>
-				Basically useless for libreboot, since it appears to be a blob.
-				Removing it didn't cause any issues in libreboot.
-			</p>
-			<p>
-				This is a 32K region from the factory image. It could be data
-				(non-functional) that the original Lenovo BIOS used, but we don't know.
-			</p>
-		
-			<p>
-				It has only a 448 byte fragment different from 0x00 or 0xFF.
-			</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/images/r400/r400_pomona.jpg b/docs/install/images/r400/r400_pomona.jpg
new file mode 100644
index 00000000..32f3411b
Binary files /dev/null and b/docs/install/images/r400/r400_pomona.jpg differ
diff --git a/docs/install/index.html b/docs/install/index.html
index 97462fd3..b5449093 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>
@@ -351,6 +353,11 @@
 					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 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.
@@ -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 00000000..ad6e4bd7
--- /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 e353e244..d4f1a912 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 94c44b7a..c686495e 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>
diff --git a/getcb b/getcb
index adf9d956..a99ffdf1 100755
--- a/getcb
+++ b/getcb
@@ -70,6 +70,11 @@ git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cher
 # fix uneven backlight on X200 (when setting brightness low)
 git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD
 
+# ThinkPad R400 support. Based on http://review.coreboot.org/#/c/8393/
+# This diff will be deleted later, and instead the patch will be fetched from coreboot gerrit
+# (and later, it won't even do that, once the R400 support is merged in coreboot)
+git am ../resources/libreboot/patch/r400.diff
+
 # Run coreboot-libre deblob scripts
 # ---------------------------------------------------------------------------------
 
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 46db4fdd..ef857286 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -123,10 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
@@ -299,8 +295,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -437,8 +431,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index e8564a80..51eb6860 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -278,8 +278,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -300,34 +298,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Display
 #
-# CONFIG_FRAMEBUFFER_VESA_MODE_100 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_101 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_102 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_103 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_104 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_105 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_106 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_107 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_108 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_109 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10A is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10B is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10C is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10D is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10E is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10F is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_110 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_111 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_112 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_113 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_114 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_115 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_116 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_117 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_118 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_119 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_11A is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_11B is not set
 CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 
 #
@@ -440,8 +410,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config
new file mode 100644
index 00000000..bc74785f
--- /dev/null
+++ b/resources/libreboot/config/r400_4mb/config
@@ -0,0 +1,466 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# coreboot configuration
+#
+
+#
+# General setup
+#
+CONFIG_EXPERT=y
+CONFIG_LOCALVERSION=""
+CONFIG_CBFS_PREFIX="fallback"
+CONFIG_COMPILER_GCC=y
+# CONFIG_COMPILER_LLVM_CLANG is not set
+# CONFIG_ANY_TOOLCHAIN is not set
+# CONFIG_CCACHE is not set
+# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_COMPRESS_RAMSTAGE=y
+CONFIG_INCLUDE_CONFIG_FILE=y
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_BROKEN_CAR_MIGRATE is not set
+CONFIG_DYNAMIC_CBMEM=y
+# CONFIG_COLLECT_TIMESTAMPS is not set
+# CONFIG_USE_BLOBS is not set
+# CONFIG_COVERAGE is not set
+# CONFIG_RELOCATABLE_MODULES is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_UPDATE_IMAGE is not set
+
+#
+# Mainboard
+#
+# CONFIG_VENDOR_AAEON is not set
+# CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADLINK is not set
+# CONFIG_VENDOR_ADVANSUS is not set
+# CONFIG_VENDOR_ADVANTECH is not set
+# CONFIG_VENDOR_AMD is not set
+# CONFIG_VENDOR_AOPEN is not set
+# CONFIG_VENDOR_APPLE is not set
+# CONFIG_VENDOR_ARIMA is not set
+# CONFIG_VENDOR_ARTECGROUP is not set
+# CONFIG_VENDOR_ASI is not set
+# CONFIG_VENDOR_ASROCK is not set
+# CONFIG_VENDOR_ASUS is not set
+# CONFIG_VENDOR_A_TREND is not set
+# CONFIG_VENDOR_AVALUE is not set
+# CONFIG_VENDOR_AXUS is not set
+# CONFIG_VENDOR_AZZA is not set
+# CONFIG_VENDOR_BACHMANN is not set
+# CONFIG_VENDOR_BCOM is not set
+# CONFIG_VENDOR_BIFFEROS is not set
+# CONFIG_VENDOR_BIOSTAR is not set
+# CONFIG_VENDOR_BROADCOM is not set
+# CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_CUBIETECH is not set
+# CONFIG_VENDOR_DIGITALLOGIC is not set
+# CONFIG_VENDOR_DMP is not set
+# CONFIG_VENDOR_EAGLELION is not set
+# CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_EMULATION is not set
+# CONFIG_VENDOR_GETAC is not set
+# CONFIG_VENDOR_GIGABYTE is not set
+# CONFIG_VENDOR_GIZMOSPHERE is not set
+# CONFIG_VENDOR_GOOGLE is not set
+# CONFIG_VENDOR_HP is not set
+# CONFIG_VENDOR_IBASE is not set
+# CONFIG_VENDOR_IBM is not set
+# CONFIG_VENDOR_IEI is not set
+# CONFIG_VENDOR_INTEL is not set
+# CONFIG_VENDOR_IWAVE is not set
+# CONFIG_VENDOR_IWILL is not set
+# CONFIG_VENDOR_JETWAY is not set
+# CONFIG_VENDOR_KONTRON is not set
+# CONFIG_VENDOR_LANNER is not set
+CONFIG_VENDOR_LENOVO=y
+# CONFIG_VENDOR_LINUTOP is not set
+# CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_MITAC is not set
+# CONFIG_VENDOR_MSI is not set
+# CONFIG_VENDOR_NEC is not set
+# CONFIG_VENDOR_NEWISYS is not set
+# CONFIG_VENDOR_NOKIA is not set
+# CONFIG_VENDOR_NVIDIA is not set
+# CONFIG_VENDOR_PACKARDBELL is not set
+# CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_RCA is not set
+# CONFIG_VENDOR_RODA is not set
+# CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SIEMENS is not set
+# CONFIG_VENDOR_SOYO is not set
+# CONFIG_VENDOR_SUNW is not set
+# CONFIG_VENDOR_SUPERMICRO is not set
+# CONFIG_VENDOR_TECHNEXION is not set
+# CONFIG_VENDOR_TECHNOLOGIC is not set
+# CONFIG_VENDOR_TELEVIDEO is not set
+# CONFIG_VENDOR_TI is not set
+# CONFIG_VENDOR_THOMSON is not set
+# CONFIG_VENDOR_TRAVERSE is not set
+# CONFIG_VENDOR_TYAN is not set
+# CONFIG_VENDOR_VIA is not set
+# CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WYSE is not set
+CONFIG_BOARD_SPECIFIC_OPTIONS=y
+CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
+CONFIG_MAINBOARD_VENDOR="LENOVO"
+CONFIG_MAX_CPUS=2
+CONFIG_VGA_BIOS_ID="8086,2a42"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
+# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+# CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
+CONFIG_UDELAY_IO=y
+CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_PCI_64BIT_PREF_MEM is not set
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x3FD000
+CONFIG_POST_IO=y
+CONFIG_POST_DEVICE=y
+# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X200 is not set
+# CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
+# CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T520 is not set
+# CONFIG_BOARD_LENOVO_T530 is not set
+# CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
+CONFIG_BOARD_LENOVO_R400=y
+CONFIG_SEABIOS_PS2_TIMEOUT=0
+CONFIG_CPU_ADDR_BITS=36
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
+CONFIG_USBDEBUG=y
+CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_IOMMU=y
+CONFIG_BOARD_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
+CONFIG_ARCH_X86=y
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
+CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_ROMSTAGE_X86_32=y
+CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_AP_IN_SIPI_WAIT is not set
+# CONFIG_SIPI_VECTOR_IN_ROM is not set
+CONFIG_RAMBASE=0x100000
+CONFIG_NUM_IPI_STARTS=2
+# CONFIG_ROMCC is not set
+CONFIG_PC80_SYSTEM=y
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
+CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
+# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+CONFIG_SYSTEM_TYPE_LAPTOP=y
+
+#
+# Chipset
+#
+
+#
+# CPU
+#
+# CONFIG_CPU_ALLWINNER_A10 is not set
+# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+# CONFIG_CPU_TI_AM335X is not set
+CONFIG_XIP_ROM_SIZE=0x10000
+# CONFIG_CPU_AMD_AGESA is not set
+# CONFIG_CPU_AMD_PI is not set
+CONFIG_CPU_INTEL_MODEL_1067X=y
+CONFIG_SMM_TSEG_SIZE=0
+CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_SSE2=y
+# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
+# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+# CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_UDELAY_LAPIC is not set
+# CONFIG_UDELAY_TSC is not set
+# CONFIG_UDELAY_TIMER2 is not set
+# CONFIG_TSC_CALIBRATE_WITH_IO is not set
+# CONFIG_TSC_SYNC_LFENCE is not set
+CONFIG_TSC_SYNC_MFENCE=y
+CONFIG_LOGICAL_CPUS=y
+# CONFIG_SMM_TSEG is not set
+# CONFIG_SMM_MODULES is not set
+# CONFIG_X86_AMD_FIXED_MTRRS is not set
+# CONFIG_PLATFORM_USES_FSP is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
+# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+CONFIG_CACHE_AS_RAM=y
+CONFIG_SMP=y
+CONFIG_AP_SIPI_VECTOR=0xfffff000
+CONFIG_MMX=y
+CONFIG_SSE=y
+CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
+# CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
+CONFIG_CPU_MICROCODE_CBFS_NONE=y
+
+#
+# Northbridge
+#
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_VIDEO_MB=0
+# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
+# CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
+CONFIG_NORTHBRIDGE_INTEL_GM45=y
+CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_MAX_PIRQ_LINKS=4
+
+#
+# Southbridge
+#
+CONFIG_EHCI_BAR=0xfef00000
+# CONFIG_AMD_SB_CIMX is not set
+# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
+# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+
+#
+# Super I/O
+#
+
+#
+# Embedded Controllers
+#
+CONFIG_EC_ACPI=y
+CONFIG_EC_LENOVO_H8=y
+CONFIG_EC_LENOVO_PMH7=y
+
+#
+# SoC
+#
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
+
+#
+# Devices
+#
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+# CONFIG_SPD_CACHE is not set
+CONFIG_PCI=y
+# CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
+CONFIG_PCIX_PLUGIN_SUPPORT=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
+CONFIG_AGP_PLUGIN_SUPPORT=y
+CONFIG_CARDBUS_PLUGIN_SUPPORT=y
+# CONFIG_AZALIA_PLUGIN_SUPPORT is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_ASPM is not set
+CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+# CONFIG_PXE_ROM is not set
+
+#
+# Display
+#
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
+
+#
+# Generic Drivers
+#
+CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
+CONFIG_DRIVERS_ICS_954309=y
+# CONFIG_INTEL_DP is not set
+# CONFIG_INTEL_DDI is not set
+CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVER_MAXIM_MAX77686 is not set
+# CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_LPC_TPM is not set
+# CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_DRIVER_TI_TPS65090 is not set
+CONFIG_DRIVERS_UART=y
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+CONFIG_HAVE_USBDEBUG=y
+CONFIG_HAVE_USBDEBUG_OPTIONS=y
+CONFIG_USBDEBUG_IN_ROMSTAGE=y
+CONFIG_USBDEBUG_DEFAULT_PORT=0
+# CONFIG_USBDEBUG_DONGLE_STD is not set
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
+CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_TPM is not set
+CONFIG_MMCONF_SUPPORT_DEFAULT=y
+CONFIG_MMCONF_SUPPORT=y
+# CONFIG_BOOTMODE_STRAPS is not set
+
+#
+# Console
+#
+CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_CONSOLE_SERIAL=y
+
+#
+# I/O mapped, 8250-compatible
+#
+CONFIG_TTYS0_BASE=0x3f8
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_BAUD=115200
+CONFIG_TTYS0_LCS=3
+# CONFIG_SPKMODEM is not set
+CONFIG_CONSOLE_USB=y
+# CONFIG_CONSOLE_NE2K is not set
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
+# CONFIG_NO_POST is not set
+# CONFIG_CMOS_POST is not set
+CONFIG_POST_DEVICE_NONE=y
+# CONFIG_POST_DEVICE_LPC is not set
+# CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
+CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_HAVE_ACPI_SLIC is not set
+CONFIG_HAVE_HARD_RESET=y
+# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_OPTION_TABLE=y
+# CONFIG_PIRQ_ROUTE is not set
+CONFIG_HAVE_SMI_HANDLER=y
+# CONFIG_PCI_IO_CFG_EXT is not set
+CONFIG_IOAPIC=y
+CONFIG_USE_WATCHDOG_ON_BOOT=y
+CONFIG_VGA=y
+# CONFIG_GFXUMA is not set
+CONFIG_HAVE_ACPI_TABLES=y
+CONFIG_HAVE_MP_TABLE=y
+CONFIG_PER_DEVICE_ACPI_TABLES=y
+# CONFIG_COMMON_FADT is not set
+
+#
+# System tables
+#
+CONFIG_GENERATE_MP_TABLE=y
+# CONFIG_GENERATE_PIRQ_TABLE is not set
+CONFIG_GENERATE_SMBIOS_TABLES=y
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
+
+#
+# Payload
+#
+# CONFIG_PAYLOAD_NONE is not set
+CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_LINUX is not set
+# CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_FILO is not set
+# CONFIG_PAYLOAD_GRUB2 is not set
+# CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
+CONFIG_PAYLOAD_FILE="grub.elf"
+CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+
+#
+# Debugging
+#
+# CONFIG_GDB_STUB is not set
+# CONFIG_DEBUG_CBFS is not set
+CONFIG_HAVE_DEBUG_RAM_SETUP=y
+# CONFIG_DEBUG_RAM_SETUP is not set
+# CONFIG_HAVE_DEBUG_CAR is not set
+# CONFIG_HAVE_DEBUG_SMBUS is not set
+# CONFIG_DEBUG_SMI is not set
+# CONFIG_DEBUG_SMM_RELOCATION is not set
+# CONFIG_DEBUG_MALLOC is not set
+# CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_USBDEBUG is not set
+# CONFIG_TRACE is not set
+# CONFIG_ENABLE_APIC_EXT_ID is not set
+CONFIG_WARNINGS_ARE_ERRORS=y
+# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
+# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
+# CONFIG_REG_SCRIPT is not set
+CONFIG_MAX_REBOOT_CNT=3
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config
new file mode 100644
index 00000000..b37593cd
--- /dev/null
+++ b/resources/libreboot/config/r400_8mb/config
@@ -0,0 +1,466 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# coreboot configuration
+#
+
+#
+# General setup
+#
+CONFIG_EXPERT=y
+CONFIG_LOCALVERSION=""
+CONFIG_CBFS_PREFIX="fallback"
+CONFIG_COMPILER_GCC=y
+# CONFIG_COMPILER_LLVM_CLANG is not set
+# CONFIG_ANY_TOOLCHAIN is not set
+# CONFIG_CCACHE is not set
+# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_COMPRESS_RAMSTAGE=y
+CONFIG_INCLUDE_CONFIG_FILE=y
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_BROKEN_CAR_MIGRATE is not set
+CONFIG_DYNAMIC_CBMEM=y
+# CONFIG_COLLECT_TIMESTAMPS is not set
+# CONFIG_USE_BLOBS is not set
+# CONFIG_COVERAGE is not set
+# CONFIG_RELOCATABLE_MODULES is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_UPDATE_IMAGE is not set
+
+#
+# Mainboard
+#
+# CONFIG_VENDOR_AAEON is not set
+# CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADLINK is not set
+# CONFIG_VENDOR_ADVANSUS is not set
+# CONFIG_VENDOR_ADVANTECH is not set
+# CONFIG_VENDOR_AMD is not set
+# CONFIG_VENDOR_AOPEN is not set
+# CONFIG_VENDOR_APPLE is not set
+# CONFIG_VENDOR_ARIMA is not set
+# CONFIG_VENDOR_ARTECGROUP is not set
+# CONFIG_VENDOR_ASI is not set
+# CONFIG_VENDOR_ASROCK is not set
+# CONFIG_VENDOR_ASUS is not set
+# CONFIG_VENDOR_A_TREND is not set
+# CONFIG_VENDOR_AVALUE is not set
+# CONFIG_VENDOR_AXUS is not set
+# CONFIG_VENDOR_AZZA is not set
+# CONFIG_VENDOR_BACHMANN is not set
+# CONFIG_VENDOR_BCOM is not set
+# CONFIG_VENDOR_BIFFEROS is not set
+# CONFIG_VENDOR_BIOSTAR is not set
+# CONFIG_VENDOR_BROADCOM is not set
+# CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_CUBIETECH is not set
+# CONFIG_VENDOR_DIGITALLOGIC is not set
+# CONFIG_VENDOR_DMP is not set
+# CONFIG_VENDOR_EAGLELION is not set
+# CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_EMULATION is not set
+# CONFIG_VENDOR_GETAC is not set
+# CONFIG_VENDOR_GIGABYTE is not set
+# CONFIG_VENDOR_GIZMOSPHERE is not set
+# CONFIG_VENDOR_GOOGLE is not set
+# CONFIG_VENDOR_HP is not set
+# CONFIG_VENDOR_IBASE is not set
+# CONFIG_VENDOR_IBM is not set
+# CONFIG_VENDOR_IEI is not set
+# CONFIG_VENDOR_INTEL is not set
+# CONFIG_VENDOR_IWAVE is not set
+# CONFIG_VENDOR_IWILL is not set
+# CONFIG_VENDOR_JETWAY is not set
+# CONFIG_VENDOR_KONTRON is not set
+# CONFIG_VENDOR_LANNER is not set
+CONFIG_VENDOR_LENOVO=y
+# CONFIG_VENDOR_LINUTOP is not set
+# CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_MITAC is not set
+# CONFIG_VENDOR_MSI is not set
+# CONFIG_VENDOR_NEC is not set
+# CONFIG_VENDOR_NEWISYS is not set
+# CONFIG_VENDOR_NOKIA is not set
+# CONFIG_VENDOR_NVIDIA is not set
+# CONFIG_VENDOR_PACKARDBELL is not set
+# CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_RCA is not set
+# CONFIG_VENDOR_RODA is not set
+# CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SIEMENS is not set
+# CONFIG_VENDOR_SOYO is not set
+# CONFIG_VENDOR_SUNW is not set
+# CONFIG_VENDOR_SUPERMICRO is not set
+# CONFIG_VENDOR_TECHNEXION is not set
+# CONFIG_VENDOR_TECHNOLOGIC is not set
+# CONFIG_VENDOR_TELEVIDEO is not set
+# CONFIG_VENDOR_TI is not set
+# CONFIG_VENDOR_THOMSON is not set
+# CONFIG_VENDOR_TRAVERSE is not set
+# CONFIG_VENDOR_TYAN is not set
+# CONFIG_VENDOR_VIA is not set
+# CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WYSE is not set
+CONFIG_BOARD_SPECIFIC_OPTIONS=y
+CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
+CONFIG_MAINBOARD_VENDOR="LENOVO"
+CONFIG_MAX_CPUS=2
+CONFIG_VGA_BIOS_ID="8086,2a42"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
+# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+# CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
+CONFIG_UDELAY_IO=y
+CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_PCI_64BIT_PREF_MEM is not set
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
+CONFIG_STACK_SIZE=0x1000
+CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x7FD000
+CONFIG_POST_IO=y
+CONFIG_POST_DEVICE=y
+# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X200 is not set
+# CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
+# CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T520 is not set
+# CONFIG_BOARD_LENOVO_T530 is not set
+# CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_G505S is not set
+CONFIG_BOARD_LENOVO_R400=y
+CONFIG_SEABIOS_PS2_TIMEOUT=0
+CONFIG_CPU_ADDR_BITS=36
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
+CONFIG_USBDEBUG=y
+CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_IOMMU=y
+CONFIG_BOARD_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+CONFIG_COREBOOT_ROMSIZE_KB=8192
+CONFIG_ROM_SIZE=0x800000
+CONFIG_ARCH_X86=y
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_RISCV is not set
+CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_ROMSTAGE_X86_32=y
+CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_AP_IN_SIPI_WAIT is not set
+# CONFIG_SIPI_VECTOR_IN_ROM is not set
+CONFIG_RAMBASE=0x100000
+CONFIG_NUM_IPI_STARTS=2
+# CONFIG_ROMCC is not set
+CONFIG_PC80_SYSTEM=y
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
+CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
+# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+CONFIG_SYSTEM_TYPE_LAPTOP=y
+
+#
+# Chipset
+#
+
+#
+# CPU
+#
+# CONFIG_CPU_ALLWINNER_A10 is not set
+# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+# CONFIG_CPU_TI_AM335X is not set
+CONFIG_XIP_ROM_SIZE=0x10000
+# CONFIG_CPU_AMD_AGESA is not set
+# CONFIG_CPU_AMD_PI is not set
+CONFIG_CPU_INTEL_MODEL_1067X=y
+CONFIG_SMM_TSEG_SIZE=0
+CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_SSE2=y
+# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
+# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+# CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_UDELAY_LAPIC is not set
+# CONFIG_UDELAY_TSC is not set
+# CONFIG_UDELAY_TIMER2 is not set
+# CONFIG_TSC_CALIBRATE_WITH_IO is not set
+# CONFIG_TSC_SYNC_LFENCE is not set
+CONFIG_TSC_SYNC_MFENCE=y
+CONFIG_LOGICAL_CPUS=y
+# CONFIG_SMM_TSEG is not set
+# CONFIG_SMM_MODULES is not set
+# CONFIG_X86_AMD_FIXED_MTRRS is not set
+# CONFIG_PLATFORM_USES_FSP is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
+# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+CONFIG_CACHE_AS_RAM=y
+CONFIG_SMP=y
+CONFIG_AP_SIPI_VECTOR=0xfffff000
+CONFIG_MMX=y
+CONFIG_SSE=y
+CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
+# CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
+CONFIG_CPU_MICROCODE_CBFS_NONE=y
+
+#
+# Northbridge
+#
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_VIDEO_MB=0
+# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_AMD_NB_CIMX is not set
+# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
+# CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
+CONFIG_NORTHBRIDGE_INTEL_GM45=y
+CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_MAX_PIRQ_LINKS=4
+
+#
+# Southbridge
+#
+CONFIG_EHCI_BAR=0xfef00000
+# CONFIG_AMD_SB_CIMX is not set
+# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
+# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+
+#
+# Super I/O
+#
+
+#
+# Embedded Controllers
+#
+CONFIG_EC_ACPI=y
+CONFIG_EC_LENOVO_H8=y
+CONFIG_EC_LENOVO_PMH7=y
+
+#
+# SoC
+#
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
+# CONFIG_SOC_UCB_RISCV is not set
+
+#
+# Devices
+#
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+# CONFIG_SPD_CACHE is not set
+CONFIG_PCI=y
+# CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
+CONFIG_PCIX_PLUGIN_SUPPORT=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
+CONFIG_AGP_PLUGIN_SUPPORT=y
+CONFIG_CARDBUS_PLUGIN_SUPPORT=y
+# CONFIG_AZALIA_PLUGIN_SUPPORT is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_ASPM is not set
+CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_EARLY_PCI_BRIDGE is not set
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+# CONFIG_PXE_ROM is not set
+
+#
+# Display
+#
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
+
+#
+# Generic Drivers
+#
+CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
+CONFIG_DRIVERS_ICS_954309=y
+# CONFIG_INTEL_DP is not set
+# CONFIG_INTEL_DDI is not set
+CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVER_MAXIM_MAX77686 is not set
+# CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_LPC_TPM is not set
+# CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_DRIVER_TI_TPS65090 is not set
+CONFIG_DRIVERS_UART=y
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+CONFIG_HAVE_USBDEBUG=y
+CONFIG_HAVE_USBDEBUG_OPTIONS=y
+CONFIG_USBDEBUG_IN_ROMSTAGE=y
+CONFIG_USBDEBUG_DEFAULT_PORT=0
+# CONFIG_USBDEBUG_DONGLE_STD is not set
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
+CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_TPM is not set
+CONFIG_MMCONF_SUPPORT_DEFAULT=y
+CONFIG_MMCONF_SUPPORT=y
+# CONFIG_BOOTMODE_STRAPS is not set
+
+#
+# Console
+#
+CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_CONSOLE_SERIAL=y
+
+#
+# I/O mapped, 8250-compatible
+#
+CONFIG_TTYS0_BASE=0x3f8
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_BAUD=115200
+CONFIG_TTYS0_LCS=3
+# CONFIG_SPKMODEM is not set
+CONFIG_CONSOLE_USB=y
+# CONFIG_CONSOLE_NE2K is not set
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
+# CONFIG_NO_POST is not set
+# CONFIG_CMOS_POST is not set
+CONFIG_POST_DEVICE_NONE=y
+# CONFIG_POST_DEVICE_LPC is not set
+# CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
+CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_HAVE_ACPI_SLIC is not set
+CONFIG_HAVE_HARD_RESET=y
+# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_OPTION_TABLE=y
+# CONFIG_PIRQ_ROUTE is not set
+CONFIG_HAVE_SMI_HANDLER=y
+# CONFIG_PCI_IO_CFG_EXT is not set
+CONFIG_IOAPIC=y
+CONFIG_USE_WATCHDOG_ON_BOOT=y
+CONFIG_VGA=y
+# CONFIG_GFXUMA is not set
+CONFIG_HAVE_ACPI_TABLES=y
+CONFIG_HAVE_MP_TABLE=y
+CONFIG_PER_DEVICE_ACPI_TABLES=y
+# CONFIG_COMMON_FADT is not set
+
+#
+# System tables
+#
+CONFIG_GENERATE_MP_TABLE=y
+# CONFIG_GENERATE_PIRQ_TABLE is not set
+CONFIG_GENERATE_SMBIOS_TABLES=y
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
+
+#
+# Payload
+#
+# CONFIG_PAYLOAD_NONE is not set
+CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_LINUX is not set
+# CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_FILO is not set
+# CONFIG_PAYLOAD_GRUB2 is not set
+# CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
+CONFIG_PAYLOAD_FILE="grub.elf"
+CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+
+#
+# Debugging
+#
+# CONFIG_GDB_STUB is not set
+# CONFIG_DEBUG_CBFS is not set
+CONFIG_HAVE_DEBUG_RAM_SETUP=y
+# CONFIG_DEBUG_RAM_SETUP is not set
+# CONFIG_HAVE_DEBUG_CAR is not set
+# CONFIG_HAVE_DEBUG_SMBUS is not set
+# CONFIG_DEBUG_SMI is not set
+# CONFIG_DEBUG_SMM_RELOCATION is not set
+# CONFIG_DEBUG_MALLOC is not set
+# CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_USBDEBUG is not set
+# CONFIG_TRACE is not set
+# CONFIG_ENABLE_APIC_EXT_ID is not set
+CONFIG_WARNINGS_ARE_ERRORS=y
+# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
+# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
+# CONFIG_REG_SCRIPT is not set
+CONFIG_MAX_REBOOT_CNT=3
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 5a3b6415..a7dce380 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -121,10 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
@@ -141,6 +137,7 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_T530 is not set
 CONFIG_BOARD_LENOVO_T60=y
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_R400 is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -313,8 +310,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -452,8 +447,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index c6bea271..2a01d69c 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -137,6 +137,7 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_R400 is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index 85528c2a..d15667ed 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -121,10 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
@@ -141,6 +137,7 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_R400 is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -301,8 +298,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -440,8 +435,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 50e86ce6..bc6c5e47 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -122,10 +122,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
@@ -142,6 +138,7 @@ CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_R400 is not set
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -314,8 +311,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -457,8 +452,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/patch/r400.diff b/resources/libreboot/patch/r400.diff
new file mode 100644
index 00000000..251ad9be
--- /dev/null
+++ b/resources/libreboot/patch/r400.diff
@@ -0,0 +1,105 @@
+From 845d9d2575184b503b35fddd5f0ea95e1d592d39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
+Date: Tue, 3 Feb 2015 23:26:05 +0100
+Subject: [PATCH] lenovo/r400: new mainboard (x200 clone)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Existing X200 port works without changes on R400.  Vendor BIOS
+provides different hda_verb (since the connectors are on front, not
+right), but this doesn't provide enough benefit to justify having
+different source files.
+
+Change-Id: I1dadddd7250ab80a4c40c2435865d72e3e5d99c9
+Signed-off-by: Michał Masłowski <mtjm@mtjm.eu>
+Signed-off-by: Francis Rowe <info@gluglug.org.uk>
+
+Conflicts:
+	src/mainboard/lenovo/x200/Kconfig
+---
+ src/mainboard/lenovo/Kconfig             | 6 ++++++
+ src/mainboard/lenovo/r400/Kconfig        | 7 +++++++
+ src/mainboard/lenovo/r400/board_info.txt | 6 ++++++
+ src/mainboard/lenovo/x200/Kconfig        | 6 +++++-
+ 4 files changed, 24 insertions(+), 1 deletion(-)
+ create mode 100644 src/mainboard/lenovo/r400/Kconfig
+ create mode 100644 src/mainboard/lenovo/r400/board_info.txt
+
+diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
+index 95f7cfd..2a7fa33 100644
+--- a/src/mainboard/lenovo/Kconfig
++++ b/src/mainboard/lenovo/Kconfig
+@@ -65,6 +65,11 @@ config BOARD_LENOVO_G505S
+ 	help
+ 	  Lenovo G505s
+ 
++config BOARD_LENOVO_R400
++	bool "ThinkPad R400"
++	help
++	  Lenovo R400 laptop. Consult wiki for details.
++
+ endchoice
+ 
+ source "src/mainboard/lenovo/x60/Kconfig"
+@@ -78,6 +83,7 @@ source "src/mainboard/lenovo/t520/Kconfig"
+ source "src/mainboard/lenovo/t530/Kconfig"
+ source "src/mainboard/lenovo/t60/Kconfig"
+ source "src/mainboard/lenovo/g505s/Kconfig"
++source "src/mainboard/lenovo/r400/Kconfig"
+ 
+ config MAINBOARD_VENDOR
+ 	string
+diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig
+new file mode 100644
+index 0000000..0966bf1
+--- /dev/null
++++ b/src/mainboard/lenovo/r400/Kconfig
+@@ -0,0 +1,7 @@
++if BOARD_LENOVO_R400
++
++config MAINBOARD_PART_NUMBER
++	string
++	default "ThinkPad R400"
++
++endif
+diff --git a/src/mainboard/lenovo/r400/board_info.txt b/src/mainboard/lenovo/r400/board_info.txt
+new file mode 100644
+index 0000000..8791abf
+--- /dev/null
++++ b/src/mainboard/lenovo/r400/board_info.txt
+@@ -0,0 +1,6 @@
++Category: laptop
++ROM package: SOIC-16 or SOIC-8
++ROM protocol: SPI
++ROM socketed: n
++Flashrom support: n
++Clone of: lenovo/x200
+diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
+index 67fc388..51c1ad7 100644
+--- a/src/mainboard/lenovo/x200/Kconfig
++++ b/src/mainboard/lenovo/x200/Kconfig
+@@ -1,4 +1,4 @@
+-if BOARD_LENOVO_X200
++if BOARD_LENOVO_X200 || BOARD_LENOVO_R400
+ 
+ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	def_bool y
+@@ -26,10 +26,14 @@ config MAINBOARD_DIR
+ 	string
+ 	default lenovo/x200
+ 
++if BOARD_LENOVO_X200
++
+ config MAINBOARD_PART_NUMBER
+ 	string
+ 	default "ThinkPad X200"
+ 
++endif
++
+ config MMCONF_BASE_ADDRESS
+ 	hex
+ 	default 0xf0000000
+-- 
+1.9.1
+
-- 
cgit v1.2.3-70-g09d2