New board: ThinkPad R500 (experimental)r500-experimental

The ich9deblob and ich9gen utilities were modified, so that they
support reading and/or writing descriptor images where the GbE
region is not defined. These utilities were also re-factored
and tidied up a bit.

A quick was noticed during the course of this work, in that
Compenent 1 Density was being set to 8MiB constantly, even
on systems with 4MiB flash chips. Component 2 Density was
set statically to 2MiB. ich9gen now sets both to 4MiB or 8MiB,
depending on whether building the descriptor for a 4MiB or
8MiB ROM image.

There are still some ACPI bugs (see docs/hcl/r500.html), which
will have to be fixed upstream. TODO: get hw reg dumps from
a factory R500, and compare with the X200 or T400 dumps.

1 files changed, 36 insertions, 1 deletions

diff --git a/docs/hcl/gm45_remove_me.html b/docs/hcl/gm45_remove_me.html
index c78dfe1..d3aff4a 100644
--- a/docs/hcl/gm45_remove_me.html
+++ b/docs/hcl/gm45_remove_me.html
@@ -110,6 +110,17 @@
 					<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>
+				Two other files will also be created, for the ThinkPad R500 which has a different NIC and, therefore,
+				no GbE region (for this laptop, it is not necessary to change the MAC address in the flash chip, because
+				it's burned into the NIC):
+			</p>
+				<ul>
+					<li><b>ich9fdnogbe_4m.bin</b>: this is for ThinkPad R500 laptops with the 4MB flash chip, where no GbE region is to be defined.</li>
+					<li><b>ich9fdnogbe_8m.bin</b>: this is for ThinkPad R500 laptops with the 8MB flash chip, where no GbE region is to be defined
+					- <b>NOTE: No actual R500 laptops with 8MiB are believed to exist. It is believed, that all R500 laptops have 4MiB flash chips</b>.</li>
+				</ul>
 			
 			<p>
 				Assuming that your libreboot image is named <b>libreboot.rom</b>, copy
@@ -117,7 +128,18 @@
 				and then insert the descriptor+gbe file into the ROM image. For 8MiB flash chips:<br/>
 				$ <b>dd if=ich9fdgbe_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b><br/>
 				For 4MiB flash chips:<br/>
-				$ <b>dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b>
+				$ <b>dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b><br/>
+			</p>
+			<p>
+				<b>For the ThinkPad R500, do this instead:</b><br/>
+				For 8MiB flash chips (<b>highly unlikely on the ThinkPad R500)</b>:<br/>
+				$ <b>dd if=ich9fdnogbe_8m.bin of=libreboot.rom bs=1 count=4k conv=notrunc</b><br/>
+				For 4MiB flash chips (<b>You probably have this)</b>:<br/>
+				$ <b>dd if=ich9fdnogbe_4m.bin of=libreboot.rom bs=1 count=4k conv=notrunc</b><br/>
+				NOTE: This shouldn't be necessary. Libreboot ROM images already contain a descriptor embedded inside
+				the ROM images for GM45, generated by the ich9gen utility. It's only desirable to re-insert your own
+				when changing the MAC address, which is unnecessary (actually impossible) on the R500, because on that laptop,
+				as already stated, the NIC already has the correct MAC address burned in, along with along configuration data.
 			</p>
 			
 			<p>
@@ -220,6 +242,11 @@
 				The first 4KiB contains the descriptor data region for your system, 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>
+				A 4KiB file named <b>deblobbed_4kdescriptor.bin</b> will alternatively appear, if no GbE region was detected inside the ROM image.
+				This is usually the case, when a discrete NIC is used (eg Broadcom) instead of Intel. Only the Intel NICs need a GbE region in
+				the flash chip.
+			</p>
 			
 			<p>
 				Assuming that your libreboot image is named <b>libreboot.rom</b>, copy
@@ -227,6 +254,14 @@
 				and then run:<br/>
 				$ <b>dd if=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc</b>
 			</p>
+			<p>
+				Alternatively, if you got a the <b>deblobbed_4kdescriptor.bin</b> file (no GbE defined),
+				do this:
+				$ <b>dd if=deblobbed_4kdescriptor.bin of=libreboot.rom bs=1 count=4k conv=notrunc</b>
+			</p>
+			<p>
+				
+			</p>
 			
 			<p>
 				The utility will also generate 4 additional files: