flashrom: add whitelist for ThinkPad R400, T400 and T500

5 files changed, 14 insertions, 17 deletions

diff --git a/docs/archive_old.html b/docs/archive_old.html
index 6d365cb..409b88a 100644
--- a/docs/archive_old.html
+++ b/docs/archive_old.html
@@ -41,16 +41,6 @@
 				<li><a href="#release20131213">r20131213 (2nd release)</a> (2013 December 13th)</li>
 				<li><a href="#release20131212">r20131212 (1st release)</a> (2013 December 12th)</li>
 			</ul>
-			<p>
-				<b><i>&quot;Release&quot;</i></b> means that a new coreboot git revision with substantially different code has been adapted for libreboot.
-			</p>
-			<p>
-				<b><i>&quot;Revision&quot;</i></b> means a modification to an existing release, where the result is insubstantially different from what preceded it.
-			</p>
-			<p>
-				The 1st, 2nd, 3rd and 4th releases were really just older revisions of the 5th release.
-				For historical reasons (and to avoid confusion), these are still called 'releases' instead of correcting the mistake.
-			</p>
 			
 	</div>
 	
diff --git a/docs/release.html b/docs/release.html
index 7db590a..09e0b4c 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -114,6 +114,7 @@
 				Changes for this release (earliest changes last, recent changes first)
 			</h2>
 				<ul>
+					<li>Add a whitelist entry to board_enable.c in flashrom, for the ThinkPad R400, T400 and T500</li>
 					<li>
 						Updated flashrom (to SVN revision 1889)
 						<ul>
diff --git a/docs/tasks.html b/docs/tasks.html
index 9f3f5f0..8b73ed2 100644
--- a/docs/tasks.html
+++ b/docs/tasks.html
@@ -127,6 +127,10 @@
 							Fix remaining incompatible LCD panels in native graphics on T500. 
 							See <a href="hcl/t500.html">hcl/t500.html</a>.
 						</li>
+						<li>
+							T400/T500/R400 (tested on T400): UART (serial port) doesn't work. Investigate.
+							(already tried enabling early h8 dock option. some RE with superiotool is needed).
+						</li>
 					</ul>
 				</li>
 				<li>
@@ -232,13 +236,13 @@
 					See <a href="http://projects.mtjm.eu/work_packages/18">http://projects.mtjm.eu/work_packages/18</a>
 				</li>
 				<li>
+					Make ich9gen/ich9deblob/demefactory show GPL license info via <i>--version</i> argument.
+				</li>
+				<li>
 					Adapt linux-libre deblob scripts for use with coreboot. Libreboot is already deblobbed
 					using its own script, but updating it is still a bit too manual. linux-libre's deblob
 					scripts do an excellent job and (adapted) will make it much easier to maintain coreboot-libre.
 				</li>
-				<li>
-					Add a whitelist entry to board_enable.c in flashrom, for the ThinkPad R400, T400 and T500
-				</li>
 			</ul>
 			<p><a href="#pagetop">Back to top of page.</a></p>
 	</div>
diff --git a/resources/flashrom/patch/x200s_x200t_whitelist.diff b/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
index 5b9da6b..4e58a3d 100644
--- a/resources/flashrom/patch/x200s_x200t_whitelist.diff
+++ b/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
@@ -2,12 +2,15 @@ Index: board_enable.c
 ===================================================================
 --- board_enable.c	(revision 1889)
 +++ board_enable.c	(working copy)
-@@ -2429,7 +2429,7 @@
+@@ -2429,7 +2429,10 @@
  	{0x8086, 0x1E22, 0x17AA, 0x21F6,  0x8086, 0x1E55, 0x17AA, 0x21F6, "^ThinkPad T530", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T530",         0,   OK, p2_whitelist_laptop},
  	{0x8086, 0x27a0, 0x17aa, 0x2015,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60",          0,   OK, p2_whitelist_laptop},
  	{0x8086, 0x27a0, 0x17aa, 0x2017,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60(s)",       0,   OK, p2_whitelist_laptop},
 -	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad X200$", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad X200",         0,   OK, p2_whitelist_laptop},
 +	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad X200", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad X200",         0,   OK, p2_whitelist_laptop},
++	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad R400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad R400",         0,   OK, p2_whitelist_laptop},
++	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T400",         0,   OK, p2_whitelist_laptop},
++	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T500",         0,   OK, p2_whitelist_laptop},
  	{0x8086, 0x3B07, 0x17AA, 0x2166,  0x8086, 0x3B30, 0x17AA, 0x2167, "^Lenovo X201", NULL, NULL,         P2, "IBM/Lenovo",  "ThinkPad X201",         0,   OK, p2_whitelist_laptop},
  	{0x8086, 0x1E22, 0x17AA, 0x21FA,  0x8086, 0x1E55, 0x17AA, 0x21FA, "^ThinkPad X230", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad X230",         0,   OK, p2_whitelist_laptop},
  	{0x8086, 0x27A0, 0x17AA, 0x2017,  0x8086, 0x27B9, 0x17AA, 0x2009, "^ThinkPad X60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad X60(s)",       0,   OK, p2_whitelist_laptop},
diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom
index fa6b060..493c4a6 100755
--- a/resources/scripts/helpers/download/flashrom
+++ b/resources/scripts/helpers/download/flashrom
@@ -43,9 +43,8 @@ svn co -r 1889 svn://flashrom.org/flashrom/trunk flashrom
 
 cd flashrom/
 
-# Enable X200 Tablet and X200S whitelist (X200 is already whitelisted)
-printf "Enabling whitelist for X200S and X200 Tablet\n"
-svn patch ../resources/flashrom/patch/x200s_x200t_whitelist.diff
+printf "Enabling whitelist for X200S, X200 Tablet, T400, T500 and R400\n"
+svn patch ../resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
 
 # Remove redundant definitions for the flash chips that
 # supported libreboot machines use. This removes the need