[M] Change in flashrom[main]: flashchips: Remove Macronix MX25U25635F from chip list

[DZ (Code Review)]

DZ has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/79633?usp=email )

Change subject: flashchips: Remove Macronix MX25U25635F from chip list
......................................................................

flashchips: Remove Macronix MX25U25635F from chip list

The MX25U25643G has same ID as MX25U25635F, and the former one is the
next generation of the latter. Therefore, we replace it with MX25U25643G
and backward compatible.

We have tested read/write/erase and write protection function for
MX25U25643G.

MX25U25643G datasheet is available at the following URL:
https://www.mxic.com.tw/en-us/products/NOR-Flash/Serial-NOR-Flash/Pages/spec...

MX25U25635F datasheet is available at the following URL:
https://www.macronix.com/en-us/products/NOR-Flash/Serial-NOR-Flash/Pages/spe...

Change-Id: Ief3fd7641bed817066692c4abffff6d3b0df16b9
Signed-off-by: danielzhang 
---
M flashchips.c
M include/flashchips.h
2 files changed, 2 insertions(+), 51 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/79633/1

diff --git a/flashchips.c b/flashchips.c
index a4605bd..8ae2680 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -10257,59 +10257,10 @@

{
    	.vendor		= "Macronix",
-		.name		= "MX25U25635F",
-		.bustype	= BUS_SPI,
-		.manufacture_id	= MACRONIX_ID,
-		.model_id	= MACRONIX_MX25U25635F,
-		.total_size	= 32768,
-		.page_size	= 256,
-		/* OTP: 512B total; enter 0xB1, exit 0xC1 */
-		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_4BA,
-		.tested		= TEST_OK_PREW,
-		.probe		= PROBE_SPI_RDID,
-		.probe_timing	= TIMING_ZERO,
-		.block_erasers	=
-		{
-			{
-				.eraseblocks = { {4 * 1024, 8192} },
-				.block_erase = SPI_BLOCK_ERASE_21,
-			}, {
-				.eraseblocks = { {4 * 1024, 8192} },
-				.block_erase = SPI_BLOCK_ERASE_20,
-			}, {
-				.eraseblocks = { {32 * 1024, 1024} },
-				.block_erase = SPI_BLOCK_ERASE_5C,
-			}, {
-				.eraseblocks = { {32 * 1024, 1024} },
-				.block_erase = SPI_BLOCK_ERASE_52,
-			}, {
-				.eraseblocks = { {64 * 1024, 512} },
-				.block_erase = SPI_BLOCK_ERASE_DC,
-			}, {
-				.eraseblocks = { {64 * 1024, 512} },
-				.block_erase = SPI_BLOCK_ERASE_D8,
-			}, {
-				.eraseblocks = { {32 * 1024 * 1024, 1} },
-				.block_erase = SPI_BLOCK_ERASE_60,
-			}, {
-				.eraseblocks = { {32 * 1024 * 1024, 1} },
-				.block_erase = SPI_BLOCK_ERASE_C7,
-			}
-		},
-		/* TODO: security register */
-		.printlock	= SPI_PRETTYPRINT_STATUS_REGISTER_BP3_SRWD, /* bit6 is quad enable */
-		.unlock		= SPI_DISABLE_BLOCKPROTECT_BP3_SRWD,
-		.write		= SPI_CHIP_WRITE256, /* Multi I/O supported */
-		.read		= SPI_CHIP_READ, /* Fast read (0x0B) and multi I/O supported */
-		.voltage	= {1650, 2000},
-	},
-
-	{
-		.vendor		= "Macronix",
    	.name		= "MX25U25643G",
    	.bustype	= BUS_SPI,
    	.manufacture_id	= MACRONIX_ID,
-		.model_id	= MACRONIX_MX25U25635F,
+		.model_id	= MACRONIX_MX25U25643G,
    	.total_size	= 32768,
    	.page_size	= 256,
    	/* OTP: 512B total; enter 0xB1, exit 0xC1 */
diff --git a/include/flashchips.h b/include/flashchips.h
index 17a6fc4..654196f 100644
--- a/include/flashchips.h
+++ b/include/flashchips.h
@@ -529,7 +529,7 @@
 #define MACRONIX_MX25U3235E	0x2536	/* Same as MX25U6435F */
 #define MACRONIX_MX25U6435E	0x2537	/* Same as MX25U6435F */
 #define MACRONIX_MX25U12835E	0x2538	/* Same as MX25U12835F */
-#define MACRONIX_MX25U25635F	0x2539     /* Same as MX25U25643G */
+#define MACRONIX_MX25U25643G	0x2539
 #define MACRONIX_MX25U51245G	0x253a
 #define MACRONIX_MX25L3235D	0x5E16	/* MX25L3225D/MX25L3235D/MX25L3237D */
 #define MACRONIX_MX25L6495F	0x9517