From ca33140ebf2ea7b09f03717fc29ee3369c99d3d2 Mon Sep 17 00:00:00 2001 From: Sean Nelson Date: Fri, 12 Feb 2010 18:40:27 +0000 Subject: [PATCH] Fix erase blocks for Winbond W25X{10,20,40,80} SPI chips The Winbond W25X10 and related chips only have 4k and 64k blocks and only accept erase commands: 20h, d8h, and c7h. Corresponding to flashrom svn r897. Signed-off-by: Sean Nelson Acked-by: David Hendricks --- flashchips.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/flashchips.c b/flashchips.c index 2d29f5704..14e6f7f91 100644 --- a/flashchips.c +++ b/flashchips.c @@ -5364,15 +5364,9 @@ struct flashchip flashchips[] = { { .eraseblocks = { {4 * 1024, 32} }, .block_erase = spi_block_erase_20, - }, { - .eraseblocks = { {32 * 1024, 4} }, - .block_erase = spi_block_erase_52, }, { .eraseblocks = { {64 * 1024, 2} }, .block_erase = spi_block_erase_d8, - }, { - .eraseblocks = { {128 * 1024, 1} }, - .block_erase = spi_block_erase_60, }, { .eraseblocks = { {128 * 1024, 1} }, .block_erase = spi_block_erase_c7, @@ -5398,15 +5392,9 @@ struct flashchip flashchips[] = { { .eraseblocks = { {4 * 1024, 64} }, .block_erase = spi_block_erase_20, - }, { - .eraseblocks = { {32 * 1024, 8} }, - .block_erase = spi_block_erase_52, }, { .eraseblocks = { {64 * 1024, 4} }, .block_erase = spi_block_erase_d8, - }, { - .eraseblocks = { {256 * 1024, 1} }, - .block_erase = spi_block_erase_60, }, { .eraseblocks = { {256 * 1024, 1} }, .block_erase = spi_block_erase_c7, @@ -5432,15 +5420,9 @@ struct flashchip flashchips[] = { { .eraseblocks = { {4 * 1024, 128} }, .block_erase = spi_block_erase_20, - }, { - .eraseblocks = { {32 * 1024, 16} }, - .block_erase = spi_block_erase_52, }, { .eraseblocks = { {64 * 1024, 8} }, .block_erase = spi_block_erase_d8, - }, { - .eraseblocks = { {512 * 1024, 1} }, - .block_erase = spi_block_erase_60, }, { .eraseblocks = { {512 * 1024, 1} }, .block_erase = spi_block_erase_c7, @@ -5466,15 +5448,9 @@ struct flashchip flashchips[] = { { .eraseblocks = { {4 * 1024, 256} }, .block_erase = spi_block_erase_20, - }, { - .eraseblocks = { {32 * 1024, 32} }, - .block_erase = spi_block_erase_52, }, { .eraseblocks = { {64 * 1024, 16} }, .block_erase = spi_block_erase_d8, - }, { - .eraseblocks = { {1024 * 1024, 1} }, - .block_erase = spi_block_erase_60, }, { .eraseblocks = { {1024 * 1024, 1} }, .block_erase = spi_block_erase_c7,