Libreboot release 6 beta 4.

- Documentation: improved (more explanations, background info) in
  docs/howtos/x60_security.html (courtesy of Denis Carikli)
- MacBook2,1 tested (confirmed)
- macbook21: Added script 'macbook21_firstflash' for flashing
  libreboot while Apple EFI firmware is running.
- Documentation: macbook21: added software-based flashing instructions
  for flashing libreboot while Apple EFI firmware is running.
- Reduced size of libreboot_src.tar.gz:
  - Removed .git and .gitignore from grub directory (libreboot_src);
    not needed. Removing them reduces the size of the archive (by a
    lot). GRUB development should be upstream.
  - Removed .git and .gitignore from bucts directory (libreboot_src);
    not needed. Removing them reduces the size of the archive. bucts
    development should be upstream.
  - Removed .svn from flashrom directory (libreboot_src); not
    needed. Removing it reduces the size of the archive. flashrom
    development should be upstream.
- Added ROM's with Qwerty (Italian) layout in GRUB
  (libreboot*itqwerty.rom)
- Added resources/utilities/i945gpu/intel-regs.py for debugging issues
  related to LCD panel compatibility on X60 Tablet and T60. (courtesy
  of Michał Masłowski)

1 files changed, 270 insertions, 111 deletions

diff --git a/docs/index.html b/docs/index.html
index 37fdd38..43d90d8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,6 +32,15 @@
 		<aside>The latest release (along with documentation) can be found at <a href="http://libreboot.org/">libreboot.org</a></aside>
 	</header>
 
+	<p>
+		It is assumed that you are running GNU/Linux. No other operating system is known to be compatible (with libreboot) for this release.
+	</p>
+
+	<p>
+		The information here is user documentation mainly. For development notes and TODO's, see <a href="RELEASE.html">RELEASE.html</a> and
+		<a href="future/index.html">future/index.html</a>
+	</p>
+
 	<h2>GNU/Linux distributions</h2>
 		<ul>
 			<li><a href="howtos/grub_boot_installer.html">How to install a GNU/Linux distribution</a></li>
@@ -41,7 +50,7 @@
 	<h2>Working with source code</h2>
 		<ul>
 			<li><a href="#build_meta">Building libreboot_src from libreboot_meta</a></li>
-			<li><a href="#build_bucts">How to build &quot;bucts&quot; (for LenovoBIOS X60/T60)</a></li>
+			<li><a href="#build_bucts">How to build &quot;bucts&quot; (for LenovoBIOS X60/X60S/X60T/T60)</a></li>
 			<li><a href="#build_flashrom">How to build &quot;flashrom&quot;</a></li>
 			<li>
 				<a href="#config">Configuring libreboot</a>
@@ -58,11 +67,13 @@
 
 	<h2>Hardware maintenance</h2>
 		<ul>
+			<li><a href="#supported_x60_list">List of supported ThinkPad X60's</a></li>
+			<li><a href="#supported_x60t_list">List of supported ThinkPad X60 Tablets</a></li>
 			<li><a href="#supported_t60_list">List of supported ThinkPad T60's</a></li>
 			<li><a href="#t60_inverter">Inverter boards for ThinkPad T60 when upgrading the LCD panel.</a></li>
 			<li><a href="#t60_ati_intel">ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences.</a></li>
-			<li><a href="howtos/x60_heatsink.html">ThinkPad X60: change the fan/heatsink</a></li>
-			<li><a href="howtos/x60_security.html">ThinkPad X60: security</a></li>
+			<li><a href="howtos/x60_heatsink.html">ThinkPad X60/X60S: change the fan/heatsink</a></li>
+			<li><a href="howtos/x60_security.html">ThinkPad X60/X60S: security</a></li>
 		</ul>
 
 	<h2>Macbook2,1</h2>
@@ -73,13 +84,14 @@
 	<h2>Installing libreboot (software: using internal programmer)</h2>
 		<ul>
 			<li><a href="#rom">Recommended ROM's to flash</a></li>
-			<li><a href="#flashrom_lenovobios">X60/T60: How to flash your ROM (if running Lenovo BIOS)</a></li>
-			<li><a href="#flashrom">X60/T60: How to flash your ROM (if running libreboot or coreboot already)</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/macbook21: How to flash your ROM (if running libreboot or coreboot already)</a></li>
 		</ul>
 
 	<h2>Installing libreboot (hardware: using external programmer)</h2>
 		<ul>
-			<li><a href="howtos/x60_unbrick.html">ThinkPad X60: How to unbrick</a></li>
+			<li><a href="howtos/x60_unbrick.html">ThinkPad X60/X60S: How to unbrick</a></li>
 		</ul>
 	
 	<h2>GRUB2 payload</h2>
@@ -94,7 +106,8 @@
 							<li><a href="#keyboards_usqwerty">QWERTY (United States)</a></li>
 							<li><a href="#keyboards_ukdvorak">Dvorak (United Kingdom)</a></li>
 							<li><a href="#keyboards_usdvorak">Dvorak (United States)</a></li>
-							<li><a href="#keyboards_frazerty">AZERTY (French)</a></li>
+							<li><a href="#keyboards_frazerty">Azerty (French)</a></li>
+							<li><a href="#keyboards_itqwerty">QWERTY (Italian)</a></li>
 						</ul>
 					</li>
 					<li><a href="#grub_custom_keyboard">Custom keyboard layout in GRUB</a></li>
@@ -102,7 +115,8 @@
 					<li><a href="#grub_ukqwerty_keyboard">UK Qwerty keyboard layout in GRUB</a></li>
 					<li><a href="#grub_dvorak_keyboard">US Dvorak keyboard layout in GRUB</a></li>
 					<li><a href="#grub_ukdvorak_keyboard">UK Dvorak keyboard layout in GRUB</a></li>
-					<li><a href="#grub_frazerty_keyboard">FR AZERTY keyboard layout in GRUB</a></li>
+					<li><a href="#grub_frazerty_keyboard">French AZERTY keyboard layout in GRUB</a></li>
+					<li><a href="#grub_itqwerty_keyboard">Italian QWERTY keyboard layout in GRUB</a></li>
 				</ul>
 			</li>
 		</ul>
@@ -164,14 +178,14 @@
 
 <hr/>
 
-	<h1 id="build_bucts">How to build &quot;bucts&quot; (for LenovoBIOS X60/T60)</h1>
+	<h1 id="build_bucts">How to build &quot;bucts&quot; (for LenovoBIOS X60/X60S/X60T/T60)</h1>
 
 		<p>
-			<b>This is for Lenovo BIOS users on the ThinkPad X60 and T60. If you have coreboot or libreboot running already, ignore this.</b>
+			<b>This is for Lenovo BIOS users on the ThinkPad X60/X60S, X60 Tablet and T60. If you have coreboot or libreboot running already, ignore this.</b>
 		</p>
 
 		<p>
-			Bucts is needed when flashing the X60/T60 ROM while Lenovo BIOS is running.
+			Bucts is needed when flashing the X60/X60S/X60T/T60 ROM while Lenovo BIOS is running.
 			Each ROM contains identical data inside the two final 64K region in the file.
 			This corresponds to the final two 64K regions in the flash chip. Lenovo BIOS will prevent you from writing the
 			final one, so running &quot;<b>bucts 1</b>&quot; will set the machine to boot from the other block instead (which
@@ -488,9 +502,71 @@
 
 <hr/>
 
+	<h1 id="supported_x60_list">List of supported ThinkPad X60's</h1>
+
+		<p>
+			Regarding native gpu initialization ('native graphics') which replaces the proprietary VGA Option ROM ('Video BIOS' or 'VBIOS'),
+			all known LCD panels are currently compatible:
+		</p>
+		<ul>
+			<li>TMD-Toshiba LTD121ECHB: #</li>
+			<li>CMO N121X5-L06: #</li>
+			<li>Samsung LTN121XJ-L07: #</li>
+			<li>BOE-Hydis HT121X01-101: #</li>		
+		</ul>
+
+		<p>
+			See <a href="#get_edid_panelname">#get_edid_panelname</a>.
+		</p>
+
+		<p><a href="#pagetop">Back to top of page.</a></p>
+
+<hr/>
+
+	<h1 id="supported_x60t_list">List of supported ThinkPad X60 Tablets</h1>
+
+		<p>
+			Regarding native gpu initialization ('native graphics') which replaces the proprietary VGA Option ROM ('Video BIOS' or 'VBIOS').
+		</p>
+
+		<p>
+			The following LCD panels are known to work:
+		</p>
+			<ul>
+				<li>
+					<b>X60T XGA (1024x768):</b>
+					<ul>
+						<li>BOE-Hydis HV121X03-100: #</li>
+					</ul>
+				</li>
+				<li>
+					<b>X60T SXGA+ (1400x1050):</b>
+					<ul>
+						<li>BOE-Hydis HV121P01-100: #</li>
+					</ul>
+				</li>
+			</ul>
+
+		<p>
+			The following LCD panels are incompatible at the moment.
+		</p>
+			<ul>
+				<li>Samsung LTN121XP01 (<a href="future/index.html#lcd_i945_incompatibility">future/index.html#lcd_i945_incompatibility</a>)</li>
+			</ul>
+
+		<p>
+			See <a href="#get_edid_panelname">#get_edid_panelname</a>.
+		</p>
+
+<hr/>
+
 	<h1 id="supported_t60_list">Supported T60 list</h1>
 
 		<p>
+			Regarding native gpu initialization ('native graphics') which replaces the proprietary VGA Option ROM ('Video BIOS' or 'VBIOS').
+		</p>
+
+		<p>
 			T60 15.4&quot; (1280x800 and 1680x1050) with Intel GPU is untested in this release. Not much yet is known about panel names.
 			They will be tested at a later date.
 		</p>
@@ -535,30 +611,6 @@
 			</li>
 		</ul>
 
-		<div class="important">
-			<p>
-				A user with 2 T60's, each with a Core 2 Duo T7200 processor tried libreboot on each machine.
-				One worked, one did not. It should be explained that in addition to the microcode (on the CPU),
-				updates are usually supplied in coreboot (from Intel) which patch the onboard microcode to fix bugs. 
-				Errata's can be found at <a href="http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf">http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf</a>
-				and <a href="http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf">http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf</a>.
-				These microcode updates are not included in libreboot because they are proprietary (blobs). Most CPU's work fine without them: hundreds
-				of Core Duo T2300/T2400/T2500/L2300/L2400/L2500 processors have been tested on the X60, and a few T5600 CPU's have been tested on the T60 (and X60 and all work).
-				In the case of the T7200, it was found that one of the two tested had instability issues (kernel panics) without the updates: work is being done to find out 
-				exactly what version of the microcode that particular CPU had in this case.
-				If you find that your CPU gives you similar issues (after trying libreboot), the current workaround is to simply try another CPU
-				(fortunately, the CPU's in the T60 are installed in a socket so replacing them is easy).
-			</p>
-			<p>
-				There might be a patched kernel that can be used, or a kernel parameter that can be used in GRUB to work around these (rare) buggy CPU's
-				(it is unknown at the moment whether this is possible).
-				The Core 2 Duo T7600 is untested, but will be tested soon (the lead developer of libreboot project has 3 of them to try out). 
-			</p>
-			<p>
-				If reading this for 2nd beta, note that any debugging obtained so far will be included in the 3rd beta.
-			</p>
-		</div>
-
 		<p>
 			To find what LCD panel you have, see: <a href="#get_edid_panelname">#get_edid_panelname</a>.
 		</p>
@@ -577,7 +629,7 @@
 						<li>
 							Tested panels:
 							<ul>
-								<li>Not working: Samsung LTN141XA-L01</li>
+								<li>Not working: Samsung LTN141XA-L01 (<a href="future/index.html#lcd_i945_incompatibility">future/index.html#lcd_i945_incompatibility</a>)</li>
 							</ul>
 						</li>
 						<li>
@@ -639,7 +691,7 @@
 						<li>
 							Tested panels:
 							<ul>
-								<li>Not working: LG-Philips LP150X09</li>
+								<li>Not working: LG-Philips LP150X09 (<a href="future/index.html#lcd_i945_incompatibility">future/index.html#lcd_i945_incompatibility</a>)</li>
 							</ul>
 						</li>
 						<li>
@@ -881,6 +933,13 @@
 			<ul>
 				<li><a href="#">Parabola GNU/Linux installation on a macbook2,1 with Apple EFI firmware</a> (this is a copy of Mono's page, see above)</li>
 			</ul>
+			<p>
+				How to boot an ISO: burn it to a CD (like you would normally) and hold down the Alt/Control key while booting. 
+				The bootloader will detect the GNU/Linux CD as 'Windows' (because Apple doesn't think GNU/Linux exists). Install it like you normally would.
+				When you boot up again, hold Alt/Control once more. The installation (on the HDD) will once again be seen as 'Windows'. (it's not actually Windows,
+				but Apple likes to think that Apple and Microsoft are all that exist.)
+				Now to install libreboot, follow <a href="#flashrom_macbook21">#flashrom_macbook21</a>.
+			</p>
 
 		<h2>
 			Information about coreboot
@@ -921,6 +980,12 @@
 			Also of interest: <a href="#config_macbook21">#config_macbook21</a>.
 		</p>
 
+		<p>
+			<b>
+				The MacBook2,1 comes with a webcam, which does not work without proprietary software. Also, webcams are a security risk; cover it up! Or remove it.
+			</b>
+		</p>
+
 		<p><a href="#pagetop">Back to top of page.</a></p>
 
 <hr/>
@@ -933,45 +998,51 @@
 				ThinkPad X60, X60s (<b>bin/x60/</b>)
 				<ul>
 					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
 					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
 					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
 					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
 					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>French Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>French Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>Italian Qwerty keyboard, no dock: <b>libreboot_itqwerty.rom</b></li>
+					<li>Italian Qwerty keyboard, with dock: <b>libreboot_serial_itqwerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
 				ThinkPad X60 Tablet (<b>bin/x60t/</b>)
 				<ul>
 					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
 					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
 					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
 					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
 					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>French Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>French Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>Italian Qwerty keyboard, no dock: <b>libreboot_itqwerty.rom</b></li>
+					<li>Italian Qwerty keyboard, with dock: <b>libreboot_serial_itqwerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
 				ThinkPad T60 (<b>bin/t60/</b>) (note, see <a href="#supported_t60_list">#supported_t60_list</a>)
 				<ul>
 					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
 					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
 					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
 					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
 					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>French Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>French Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
+					<li>Italian Qwerty keyboard, no dock: <b>libreboot_itqwerty.rom</b></li>
+					<li>Italian Qwerty keyboard, with dock: <b>libreboot_serial_itqwerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
@@ -981,7 +1052,8 @@
 					<li>UK Qwerty keyboard: <b>libreboot_ukqwerty.rom</b></li>
 					<li>US Dvorak keyboard: <b>libreboot_usdvorak.rom</b></li>
 					<li>UK Dvorak keyboard: <b>libreboot_ukdvorak.rom</b></li>
-					<li>FR Azerty keyboard: <b>libreboot_frazerty.rom</b></li>
+					<li>French Azerty keyboard: <b>libreboot_frazerty.rom</b></li>
+					<li>Italian Qwerty keyboard: <b>libreboot_itqwerty.rom</b></li>
 					<li>The MacBook2,1 uses the same chipset, i945, as the X60/X60s X60T and T60 but there is no dock or serial port available for this machine.</li>
 				</ul>
 			</li>
@@ -1000,7 +1072,7 @@
 
 <hr/>
 
-	<h1 id="flashrom_lenovobios">X60/T60: How to flash the ROM's onto your machine (if running Lenovo BIOS).</h1>
+	<h1 id="flashrom_lenovobios">X60/X60S/X60T/T60: How to flash the ROM's onto your machine (if running Lenovo BIOS firmware).</h1>
 
 		<div class="important">
 
@@ -1107,20 +1179,41 @@
 
 <hr/>
 
-	<h1 id="flashrom">X60/T60: How to flash the ROM's onto your machine (if running libreboot or coreboot already)</h1>
+	<h1 id="flashrom_macbook21">macbook21: How to flash your ROM (if running Apple EFI firmware)</h1>
+
+		<div class="important">
+
+			<p>
+				Hover over the next paragraph to make it black.
+			</p>
+			<p class="lenovobios">
+				Following this guide means simply flashing a libreboot ROM. This guide will not (directly) teach you how to make a backup (dump) of the original Apple EFI firmware
+				because to do so would be to explicitly endorse proprietary software. However, for the purposes of reverse engineering it can be useful
+				to have a backup. Each copy of the original Apple EFI is (believed, but unproven to be) tied to the specific machine that it came from; it will not (as is believed) run
+				on any other machine, even if it's the same type of machine as yours. What this means is that, effectively, you can back it up now (so that you can
+				re-flash it later if you want to run the original Apple EFI firmware again) or lose it forever. The macbook21 installation
+				guide on the coreboot wiki will show you how to do this: 
+				<a href="http://www.coreboot.org/Board:apple/macbook21">http://www.coreboot.org/Board:apple/macbook21</a>.<br/>
+				Do not make this decision lightly! This is (very likely) your last and only chance.
+			</p>
+
+			<p>
+				(this theory is untested at the time of writing)
+			</p>
+
+		</div>
 
 		<p>
-			<b>These instructions work for both the ThinkPad X60 and T60.</b>
-		</p>
-		<p>
-			<b>This assumes that you already have coreboot or libreboot running</b>
-		</p>
-		<p>
-			<b>If you have Lenovo BIOS running, go to <a href="#flashrom_lenovobios">#flashrom_lenovobios</a> instead.</b>
+			<b>
+				This is for the MacBook2,1 while running Apple EFI firmware. If you already have 
+				coreboot or libreboot running, then go to <a href="#flashrom">#flashrom</a> instead!
+			</b>
 		</p>
+
 		<p>
-			<b>If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="#supported_t60_list">#supported_t60_list</a></b>
+			Be sure to read the information in <a href="#macbook21">#macbook21</a>.
 		</p>
+
 		<p>
 			If you need to recompile flashrom:<br/>
 			<b>See: <a href="#build_flashrom">#build_flashrom</a></b>
@@ -1130,31 +1223,108 @@
 			<b>$ sudo ./builddeb-flashrom</b>
 		</p>
 		<p>
-			Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternative you may be using your own
+			Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternatively you may be using your own
 			custom ROM. Adapt.
 		</p>
+
 		<p>
-			Flash the ROM:<br/>
-			<b>$ sudo ./flash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
+			Flashing is actually easy (compared to X60/T60).<br/>
+			<b>$ sudo flashrom -p internal:laptop=force_I_want_a_brick -w bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
 		</p>
+
 		<p>
-			You should see <b>&quot;Verifying flash... VERIFIED.&quot;</b> written at the end of the flashrom output. <b>SHUT DOWN</b>
-			after you see this, and then boot up again after a few seconds.
+			Alternatively, a script is provided which does the same thing:<br/>
+			<b>$ sudo ./macbook21_firstflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
 		</p>
 
+		<div class="important">
+
+			<p>
+				You should also see within the output the following:<br/>
+				<b>&quot;Verifying flash... VERIFIED.&quot;</b>
+			</p>
+
+			<p>
+				If you see that, great! Shut down now (power off). Wait a few seconds and then boot!
+			</p>
+
+		</div>
+
+		<p><a href="#pagetop">Back to top of page.</a></p>
+
+<hr/>
+
+	<h1 id="flashrom">X60/X60S/X60T/T60/macbook21: How to flash the ROM's onto your machine (if running libreboot or coreboot already)</h1>
+
 		<p>
 			<b>
-				If you boot and you see nothing, try turning up the backlight (Fn+Home). 
-				If this is a ThinkPad X60 and backlight resets to zero when turning it up while at max, look at <a href="#tft_brightness">#tft_brightness</a>.
+				These instructions work for the Lenovo ThinkPad X60/X60S/X60T/T60 and Apple MacBook2,1.
 			</b>
 		</p>
-
 		<p>
 			<b>
-				If this is a ThinkPad X60 then you can look at <a href="#x60_wifi">#x60_wifi</a> for how to enable/disable wifi.
-				You can also look at <a href="#x60_trackpoint">#x60_trackpoint</a> for how to enable/disable the trackpoint (red mouse on keyboard).
+				This assumes that you already have coreboot or libreboot running.
+			</b>
+		</p>
+		<p>
+			<b>
+				If you have Lenovo BIOS running (X60/X60S/X60T/T60), go to <a href="#flashrom_lenovobios">#flashrom_lenovobios</a> instead.
+			</b>
+		</p>
+		<p>
+			<b>
+				If you have Apple EFI firmware running (macbook21), go to <a href="#flashrom_macbook21">#flashrom_macbook21</a> instead.
+			</b>
+		</p>
+		<p>
+			<b>
+				If you are flashing a Lenovo ThinkPad T60, be sure to read <a href="#supported_t60_list">#supported_t60_list</a>.
+			</b>
+		</p>
+		<p>
+			<b>
+				If you are flashing an Apple MacBook2,1, be sure to read the information in <a href="#macbook21">#macbook21</a>.
 			</b>
 		</p>
+		<p>
+			If you need to recompile flashrom:<br/>
+			<b>See: <a href="#build_flashrom">#build_flashrom</a></b>
+		</p>
+		<p>
+			You also need the run-time dependencies. This script works on apt-get distros:<br/>
+			<b>$ sudo ./builddeb-flashrom</b>
+		</p>
+		<p>
+			Look at <a href="#rom">#rom</a> to see which ROM is suitable for your machine. Alternative you may be using your own
+			custom ROM. Adapt.
+		</p>
+		<p>
+			Flash the ROM:<br/>
+			<b>$ sudo ./flash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
+		</p>
+
+		<div class="important">
+
+			<p>
+				You should see <b>&quot;Verifying flash... VERIFIED.&quot;</b> written at the end of the flashrom output. <b>SHUT DOWN</b>
+				after you see this, and then boot up again after a few seconds.
+			</p>
+
+			<p>
+				<b>
+					If you boot and you see nothing, try turning up the backlight (Fn+Home). 
+					If this is a ThinkPad X60 and backlight resets to zero when turning it up while at max, look at <a href="#tft_brightness">#tft_brightness</a>.
+				</b>
+			</p>
+
+			<p>
+				<b>
+					If this is a ThinkPad X60 then you can look at <a href="#x60_wifi">#x60_wifi</a> for how to enable/disable wifi.
+					You can also look at <a href="#x60_trackpoint">#x60_trackpoint</a> for how to enable/disable the trackpoint (red mouse on keyboard).
+				</b>
+			</p>
+
+		</div>
 
 		<p><a href="#pagetop">Back to top of page</a></p>
 
@@ -1222,10 +1392,14 @@
 					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png</a>
 				</p>
 
-			<h3 id="keyboards_azerty">AZERTY (French)</h3>
+			<h3 id="keyboards_frazerty">AZERTY (French)</h3>
 				<p>
 					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/KB_France.svg/800px-KB_France.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/KB_France.svg/800px-KB_France.svg.png</a>
 				</p>
+			<h3 id="keyboards_itqwerty">QWERTY (Italian)</h3>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/Italian_Keyboard_layout.svg/799px-Italian_Keyboard_layout.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/Italian_Keyboard_layout.svg/799px-Italian_Keyboard_layout.svg.png</a>
+				</p>
 
 			<p><a href="#pagetop">Back to top of page</a></p>
 
@@ -1260,72 +1434,48 @@
 
 		<h2 id="grub_qwerty_keyboard">US Qwerty keyboard layout in GRUB (for reference)</h2>
 
-			<p><b>$ cd libreboot_src/grub</b><br/>
-			compile grub ('build' script has the info on how to do this)<br/>
-			come back out into libreboot_src<br/>
-			<b>$ cd ../</b></p>
-
 			<p>Generate the layout file:<br/>
 			<b>$ ckbcomp us > usqwerty</b><br/>
 			<b>$ cat usqwerty | ./grub/grub-mklayout -o usqwerty.gkb</b></p>
 
-			<p>Note: these files are already included ('build' script also makes use of them). You don't need to do any of this.</p>
-
 			<p><a href="#pagetop">Back to top of page</a></p>
 
 		<h2 id="grub_ukqwerty_keyboard">UK Qwerty keyboard layout in GRUB (for reference)</h2>
 
-			<p><b>$ ckbcomp gb > ukqwerty</b><br/>
+			<p>Generate the layout file:<br/>
+			<b>$ ckbcomp gb > ukqwerty</b><br/>
 			<b>$ cat ukqwerty | ./grub/grub-mklayout -o ukqwerty.gkb</b></p>
 
-			<p>Note: these files are already included ('build' script makes use of them). You don't need to do it.</p>
-
 			<p><a href="#pagetop">Back to top of page</a></p>
 
 		<h2 id="grub_dvorak_keyboard">US Dvorak keyboard layout in GRUB (for reference)</h2>
 
-			<p>How the dvorak.gkb was made (for US Dvorak layout in GRUB).</p>
-
-			<p><b>$ cd libreboot_src/grub</b><br/>
-			compile grub ('build' script has the info on how to do this)<br/>
-			come back out into libreboot_src:<br/>
-			<b>$ cd ../</b></p>
-
 			<p>Generate the layout file:<br/>
 			<b>$ ckbcomp dvorak > usdvorak</b><br/>
-			<b>$ cat usdvorak | ./grub/grub-mklayout -o dvorak.gkb</b></p>
-
-			<p>Note: these files are already included ('build' script makes use of them). You don't need to do it.</p>
+			<b>$ cat usdvorak | ./grub/grub-mklayout -o usdvorak.gkb</b></p>
 
 			<p><a href="#pagetop">Back to top of page</a></p>
 
 		<h2 id="grub_ukdvorak_keyboard">UK Dvorak keyboard layout in GRUB (for reference)</h2>
 
-			<p>There isn't much difference to US Dvorak.<br/>
-			<b>$ cp usdvorak ukdvorak</b></p>
-
-			<p>Patch ukdvorak like so (diff usdvorak ukdvorak):<br/>
-			diff the usdvorak file with ukdvorak to see how it was patched.</p>
+			<p>
+				ukdvorak had to be created manually, based on usdvorak. diff them (under resources/grub/keymap/original)
+				to see how ukdvorak file was created
+			</p>
 
-			<p>Now create ukdvorak.gkb<br/>
 			<b>$ cat ukdvorak | ./grub/grub-mklayout -o ukdvorak.gkb</b></p>
 
-			<p>Note: these files are already included ('build' script makes use of them). You don't need to do any of this.</p>
-
-		<h2 id="grub_frazerty_keyboard">FR AZERTY keyboard layout in GRUB (for reference)</h2>
-
-			<p>How the frazerty.gkb was made (for FR AZERTY layout in GRUB).</p>
-
-			<p><b>$ cd libreboot_src/grub</b><br/>
-			compile grub ('build' script has the info on how to do this)<br/>
-			come back out into libreboot_src:<br/>
-			<b>$ cd ../</b></p>
+		<h2 id="grub_frazerty_keyboard">French AZERTY keyboard layout in GRUB (for reference)</h2>
 
 			<p>Generate the layout file:<br/>
 			<b>$ ckbcomp fr > frazerty</b><br/>
 			<b>$ cat frazerty | ./grub/grub-mklayout -o frazerty.gkb</b></p>
 
-			<p>Note: these files are already included ('build' script makes use of them). You don't need to do it.</p>
+		<h2 id="grub_itqwerty_keyboard">Italian QWERTY keyboard layout in GRUB (for reference)</h2>
+
+			<p>Generate the layout file:<br/>
+			<b>$ ckbcomp it > itqwerty</b><br/>
+			<b>$ cat itqwerty | ./grub/grub-mklayout -o itqwerty.gkb</b></p>
 
 		<p><a href="#pagetop">Back to top of page</a></p>
 
@@ -1521,11 +1671,20 @@ WantedBy=multi-user.target
 
 <pre>
 	Unlisted note: http://inertiawar.com/microcode/
+	Read that thread: http://www.coreboot.org/pipermail/coreboot/2014-July/078261.html
 	(link published to coreboot mailing list on July 8, 2014)
+	Document everything listed in this discussion (and the link)
+
+	SeaVGABIOS+SeaBIOS support for X60/T60:
+	Read that: http://www.coreboot.org/pipermail/coreboot/2014-July/078342.html
 
 	This page talks about 'calibration' in powertop:
 	https://docs.fedoraproject.org/en-US/Fedora/15/html/Power_Management_Guide/PowerTOP.html
 	I should think about adapting information here based on that page.
+
+	Look into 'git archive' instead of deleting .git
+	eg (coreboot directory):
+	git archive --format=tar --prefix=libreboot/ -o ../libreboot_release.tar HEAD
 </pre>
 
 <hr/>