Removed redundant flashchip definitions in flashrom

For X200 owners with one of the Macronix flash chips. There are
multiple definitions for almost the same chip, and they are
all detected at once. Normally the user has to use the -c argument
in flashrom to select a flash chip. With this modification, they
can run flashrom without the argument.

Deletion of redundant flash chip definitions is now also handled
by getflashrom instead of builddeps-flashrom. builddeps-flashrom
now only patches for i945 lenovo bios sst/macronix.

1 files changed, 0 insertions, 148 deletions

diff --git a/resources/flashrom/patch/flashchips.c.diff.lenovobios_macronix b/resources/flashrom/patch/flashchips.c.diff.lenovobios_macronix
deleted file mode 100644
index 9cdedcc..0000000
--- a/resources/flashrom/patch/flashchips.c.diff.lenovobios_macronix
+++ /dev/null
@@ -1,148 +0,0 @@
---- flashchips.c	2014-12-14 11:05:12.512662091 +0000
-+++ flashchips.c.patch.i945_lenovobios_macronix	2014-12-14 11:16:51.224126814 +0000
-@@ -6602,89 +6602,15 @@
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L1605",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
--		.total_size	= 2048,
--		.page_size	= 256,
--		.feature_bits	= FEATURE_WRSR_WREN,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */
--		.unlock		= spi_disable_blockprotect,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
--		.name		= "MX25L1605A/MX25L1606E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
--		.total_size	= 2048,
--		.page_size	= 256,
--		/* OTP: 64B total; enter 0xB1, exit 0xC1 (MX25L1606E only) */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 512} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* MX25L1605A bp2 only */
--		.unlock		= spi_disable_blockprotect,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L1605D/MX25L1608D/MX25L1673E",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
-+		.model_id	= 0x14,
- 		.total_size	= 2048,
- 		.page_size	= 256,
- 		.feature_bits	= FEATURE_WRSR_WREN,
- 		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
-+		.probe		= probe_spi_res1,
- 		.probe_timing	= TIMING_ZERO,
- 		.block_erasers	=
- 		{
-@@ -6704,7 +6630,7 @@
- 		},
- 		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* bit6: Continuously Program (CP) mode */
- 		.unlock		= spi_disable_blockprotect,
--		.write		= spi_chip_write_256,
-+		.write		= spi_chip_write_1,
- 		.read		= spi_chip_read, /* Fast read (0x0B), dual I/O supported */
- 		.voltage	= {2700, 3600},
- 	},
-@@ -11141,44 +11067,6 @@
- 		.unlock		= spi_disable_blockprotect,
- 		.write		= spi_aai_write,
- 		.read		= spi_chip_read,
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "SST",
--		.name		= "SST25VF016B",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= SST_ID,
--		.model_id	= SST_SST25VF016B,
--		.total_size	= 2048,
--		.page_size	= 256,
--		.feature_bits	= FEATURE_WRSR_EITHER,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 512} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {32 * 1024, 64} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_sst25vf016,
--		.unlock		= spi_disable_blockprotect,
--		.write		= spi_aai_write,
--		.read		= spi_chip_read,
- 		.voltage	= {2700, 3600},
- 	},
-