Change in flashrom[master]: Address review feedback.

[David Bartley (Code Review)]

David Bartley has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55125 )

Change subject: Address review feedback.
......................................................................

Address review feedback.

Signed-off-by: David Bartley 
Change-Id: I8701831da4e59fc5ab48c609d6ad0cf764c5625d
---
M flashchips.c
1 file changed, 44 insertions(+), 46 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/25/55125/1

diff --git a/flashchips.c b/flashchips.c
index e83e39d..9b818eb 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -17048,6 +17048,50 @@

{
    	.vendor		= "Winbond",
+		.name		= "W25Q01V",
+		.bustype	= BUS_SPI,
+		.manufacture_id	= WINBOND_NEX_ID,
+		.model_id	= WINBOND_NEX_W25Q01JV,
+		.total_size	= 128 * 1024,
+		.page_size	= 256,
+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA,
+		.tested		= TEST_OK_PREW,
+		.probe		= probe_spi_rdid,
+		.probe_timing	= TIMING_ZERO,
+		.block_erasers	=
+		{
+			{
+				.eraseblocks = { {4 * 1024, 32768} },
+				.block_erase = spi_block_erase_21,
+			}, {
+				.eraseblocks = { {4 * 1024, 32768} },
+				.block_erase = spi_block_erase_20,
+			}, {
+				.eraseblocks = { {32 * 1024, 4096} },
+				.block_erase = spi_block_erase_52,
+			}, {
+				.eraseblocks = { {64 * 1024, 2048} },
+				.block_erase = spi_block_erase_dc,
+			}, {
+				.eraseblocks = { {64 * 1024, 2048} },
+				.block_erase = spi_block_erase_d8,
+			}, {
+				.eraseblocks = { {128 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_60,
+			}, {
+				.eraseblocks = { {128 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_c7,
+			}
+		},
+		.printlock	= spi_prettyprint_status_register_bp3_srwd,
+		.unlock		= spi_disable_blockprotect_bp3_srwd,
+		.write		= spi_chip_write_256,
+		.read		= spi_chip_read,
+		.voltage	= {2700, 3600},
+	},
+
+	{
+		.vendor		= "Winbond",
    	.name		= "W25Q128.V",
    	.bustype	= BUS_SPI,
    	.manufacture_id	= WINBOND_NEX_ID,
@@ -17742,52 +17786,6 @@

{
    	.vendor		= "Winbond",
-		.name		= "W25Q501V",
-		.bustype	= BUS_SPI,
-		.manufacture_id	= WINBOND_NEX_ID,
-		.model_id	= WINBOND_NEX_W25Q01JV,
-		.total_size	= 128 * 1024,
-		.page_size	= 256,
-		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA,
-		.tested		= TEST_OK_PREW,
-		.probe		= probe_spi_rdid,
-		.probe_timing	= TIMING_ZERO,
-		.block_erasers	=
-		{
-			/* Full chip erase is fastest, typically takes 200s */
-			{
-				.eraseblocks = { {128 * 1024 * 1024, 1} },
-				.block_erase = spi_block_erase_60,
-			}, {
-				.eraseblocks = { {128 * 1024 * 1024, 1} },
-				.block_erase = spi_block_erase_c7,
-			}, {
-				.eraseblocks = { {64 * 1024, 2048} },
-				.block_erase = spi_block_erase_dc,
-			}, {
-				.eraseblocks = { {64 * 1024, 2048} },
-				.block_erase = spi_block_erase_d8,
-			}, {
-				.eraseblocks = { {4 * 1024, 32768} },
-				.block_erase = spi_block_erase_21,
-			}, {
-				.eraseblocks = { {32 * 1024, 4096} },
-				.block_erase = spi_block_erase_52,
-			}, {
-				.eraseblocks = { {4 * 1024, 32768} },
-				.block_erase = spi_block_erase_20,
-			}
-		},
-		.printlock	= spi_prettyprint_status_register_plain,
-		.unlock		= spi_disable_blockprotect,
-		.write		= spi_chip_write_256,
-		.read		= spi_chip_read,
-		.voltage	= {2700, 3600},
-	},
-
-
-	{
-		.vendor		= "Winbond",
    	.name		= "W25Q64.V",
    	.bustype	= BUS_SPI,
    	.manufacture_id	= WINBOND_NEX_ID,