Libreboot r20150518 (fix mistake in flashrom patch)r20150518fix

Released on May 18th, 2015.

3 files changed, 58 insertions, 15 deletions

diff --git a/resources/flashrom/patch/purged_chips.diff b/resources/flashrom/patch/purged_chips.diff
index e15c2fd..b7c45be 100644
--- a/resources/flashrom/patch/purged_chips.diff
+++ b/resources/flashrom/patch/purged_chips.diff
@@ -1,8 +1,8 @@
-Index: flashchips.c
-===================================================================
---- flashchips.c	(revision 1889)
-+++ flashchips.c	(working copy)
-@@ -7038,80 +7038,6 @@
+diff --git a/flashchips.c b/flashchips.c
+index c722a64..4124023 100644
+--- a/flashchips.c
++++ b/flashchips.c
+@@ -7038,80 +7038,6 @@ const struct flashchip flashchips[] = {
  
  	{
  		.vendor		= "Macronix",
@@ -83,7 +83,7 @@ Index: flashchips.c
  		.name		= "MX25L1605D/MX25L1608D/MX25L1673E",
  		.bustype	= BUS_SPI,
  		.manufacture_id	= MACRONIX_ID,
-@@ -7219,41 +7145,6 @@
+@@ -7219,41 +7145,6 @@ const struct flashchip flashchips[] = {
  
  	{
  		.vendor		= "Macronix",
@@ -125,7 +125,7 @@ Index: flashchips.c
  		.name		= "MX25L3205D/MX25L3208D",
  		.bustype	= BUS_SPI,
  		.manufacture_id	= MACRONIX_ID,
-@@ -7290,84 +7181,6 @@
+@@ -7290,84 +7181,6 @@ const struct flashchip flashchips[] = {
  
  	{
  		.vendor		= "Macronix",
@@ -210,7 +210,50 @@ Index: flashchips.c
  		.name		= "MX25L3235D",
  		.bustype	= BUS_SPI,
  		.manufacture_id	= MACRONIX_ID,
-@@ -7476,86 +7289,6 @@
+@@ -7404,42 +7217,6 @@ const struct flashchip flashchips[] = {
+ 
+ 	{
+ 		.vendor		= "Macronix",
+-		.name		= "MX25L6405",
+-		.bustype	= BUS_SPI,
+-		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L6405,
+-		.total_size	= 8192,
+-		.page_size	= 256,
+-		/* Has an additional 512B EEPROM sector */
+-		.feature_bits	= FEATURE_WRSR_WREN,
+-		.tested		= TEST_OK_PREW,
+-		.probe		= probe_spi_rdid,
+-		.probe_timing	= TIMING_ZERO,
+-		.block_erasers	=
+-		{
+-			{
+-				.eraseblocks = { {64 * 1024, 128} },
+-				.block_erase = spi_block_erase_20,
+-			}, {
+-				.eraseblocks = { {64 * 1024, 128} },
+-				.block_erase = spi_block_erase_d8,
+-			}, {
+-				.eraseblocks = { {8 * 1024 * 1024, 1} },
+-				.block_erase = spi_block_erase_60,
+-			}, {
+-				.eraseblocks = { {8 * 1024 * 1024, 1} },
+-				.block_erase = spi_block_erase_c7,
+-			}
+-		},
+-		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* bit6: error flag */
+-		.unlock		= spi_disable_blockprotect_bp3_srwd,
+-		.write		= spi_chip_write_256,
+-		.read		= spi_chip_read, /* Fast read (0x0B) supported */
+-		.voltage	= {2700, 3600},
+-	},
+-
+-	{
+-		.vendor		= "Macronix",
+ 		.name		= "MX25L6405D",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+@@ -7476,86 +7253,6 @@ const struct flashchip flashchips[] = {
  
  	{
  		.vendor		= "Macronix",
diff --git a/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff b/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
index 4e58a3d..63dad51 100644
--- a/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
+++ b/resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
@@ -1,8 +1,8 @@
-Index: board_enable.c
-===================================================================
---- board_enable.c	(revision 1889)
-+++ board_enable.c	(working copy)
-@@ -2429,7 +2429,10 @@
+diff --git a/board_enable.c b/board_enable.c
+index 31984e3..aca7523 100644
+--- a/board_enable.c
++++ b/board_enable.c
+@@ -2429,7 +2429,10 @@ const struct board_match board_matches[] = {
  	{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},
diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom
index 493c4a6..9a966ee 100755
--- a/resources/scripts/helpers/download/flashrom
+++ b/resources/scripts/helpers/download/flashrom
@@ -44,13 +44,13 @@ svn co -r 1889 svn://flashrom.org/flashrom/trunk flashrom
 cd flashrom/
 
 printf "Enabling whitelist for X200S, X200 Tablet, T400, T500 and R400\n"
-svn patch ../resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
+patch board_enable.c < ../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
 # for the user to run with the "-c" argument on these machines
 printf "Patching flashchips.c to remove the redundant entries\n"
-svn patch ../resources/flashrom/patch/purged_chips.diff
+patch flashchips.c < ../resources/flashrom/patch/purged_chips.diff
 
 cd ../