From a745cf4660154bc33116f7520bcb78064eb6346d Mon Sep 17 00:00:00 2001 From: Mattias Mattsson Date: Tue, 14 Sep 2010 23:56:56 +0000 Subject: Various style/consistency fixes mainly for Winbond chips Rename constants W_nnnn -> WINBOND_Wnnnn W_25nnn -> WINBOND_NEX_W25nnn. Kill incorrect ASD chip and vendor id. Group Winbond SPI and parallel chips separately (they have different vendor IDs). Change constant names to the "canonical" chip name for the following ids: W_29C020C (0x45) -> WINBOND_W29C020 (Same as W29C020C, W29C022 and ASD AE29F2008) W_29C040P (0x46) -> WINBOND_W29C040 ("P" is for package type [32-pin PLCC], irrelevant) W_29C011 + W_29EE011 (0xC1) -> WINBOND_W29C010 (Same as W29C010M, W29C011A, W29EE011, W29EE012, and ASD AE29F1008) List all chip variants in the .name strings in flashchips.c Have two identical entries for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012 but with different probe functions in flashchips.c as sometimes (for newer revisions of these chips?) the standard jedec probe seems to work. E.g. see test report here: http://patchwork.coreboot.org/patch/1476/ Also add ids for the following Winbond chips: W25Q40 W25Q128 W19B160BB W19B160BT W19B320SB/W19L320SB W19B320ST/W19L320ST W19B322MB W19B322MT W19B323MB W19B323MT W19B324MB W19B324MT W29C512A/W29EE512 W39L010 W39L040A W39L512 W49F002/W49F002B Corresponding to flashrom svn r1168. Signed-off-by: Mattias Mattsson Acked-by: Uwe Hermann --- flashchips.c | 97 +++++++++++++++++++++--------------------------------------- 1 file changed, 33 insertions(+), 64 deletions(-) (limited to 'flashchips.c') diff --git a/flashchips.c b/flashchips.c index 1f70846..3ab19bb 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1003,37 +1003,6 @@ struct flashchip flashchips[] = { }, { - .vendor = "ASD", - .name = "AE49F2008", - .bustype = CHIP_BUSTYPE_PARALLEL, - .manufacture_id = ASD_ID, - .model_id = ASD_AE49F2008, - .total_size = 256, - .page_size = 128, - .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, - .probe = probe_jedec, - .probe_timing = TIMING_FIXME, - .block_erasers = - { - { - .eraseblocks = { - {128 * 1024, 1}, - {96 * 1024, 1}, - {8 * 1024, 2}, - {16 * 1024, 1}, - }, - .block_erase = erase_sector_jedec, - }, { - .eraseblocks = { {256 * 1024, 1} }, - .block_erase = erase_chip_block_jedec, - } - }, - .write = write_jedec, - .read = read_memmapped, - }, - - { .vendor = "Atmel", .name = "AT25DF021", .bustype = CHIP_BUSTYPE_SPI, @@ -6957,7 +6926,7 @@ struct flashchip flashchips[] = { .name = "W25Q80", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25Q80, + .model_id = WINBOND_NEX_W25Q80, .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -6993,7 +6962,7 @@ struct flashchip flashchips[] = { .name = "W25Q16", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25Q16, + .model_id = WINBOND_NEX_W25Q16, .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7029,7 +6998,7 @@ struct flashchip flashchips[] = { .name = "W25Q32", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25Q32, + .model_id = WINBOND_NEX_W25Q32, .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7065,7 +7034,7 @@ struct flashchip flashchips[] = { .name = "W25Q64", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25Q64, + .model_id = WINBOND_NEX_W25Q64, .total_size = 8192, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7101,7 +7070,7 @@ struct flashchip flashchips[] = { .name = "W25x10", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X10, + .model_id = WINBOND_NEX_W25X10, .total_size = 128, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7131,7 +7100,7 @@ struct flashchip flashchips[] = { .name = "W25x20", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X20, + .model_id = WINBOND_NEX_W25X20, .total_size = 256, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7161,7 +7130,7 @@ struct flashchip flashchips[] = { .name = "W25x40", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X40, + .model_id = WINBOND_NEX_W25X40, .total_size = 512, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7191,7 +7160,7 @@ struct flashchip flashchips[] = { .name = "W25x80", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X80, + .model_id = WINBOND_NEX_W25X80, .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7221,7 +7190,7 @@ struct flashchip flashchips[] = { .name = "W25x16", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X16, + .model_id = WINBOND_NEX_W25X16, .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7257,7 +7226,7 @@ struct flashchip flashchips[] = { .name = "W25x32", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X32, + .model_id = WINBOND_NEX_W25X32, .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7293,7 +7262,7 @@ struct flashchip flashchips[] = { .name = "W25x64", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = WINBOND_NEX_ID, - .model_id = W_25X64, + .model_id = WINBOND_NEX_W25X64, .total_size = 8192, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, @@ -7326,10 +7295,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W29C011", + .name = "W29C010(M)/W29C011A/W29EE011/W29EE012", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_29C011, + .model_id = WINBOND_W29C010, .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, @@ -7349,10 +7318,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W29C020C", + .name = "W29C020(C)/W29C022", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_29C020C, + .model_id = WINBOND_W29C020, .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, @@ -7372,10 +7341,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W29C040P", + .name = "W29C040/P", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_29C040P, + .model_id = WINBOND_W29C040, .total_size = 512, .page_size = 256, .feature_bits = FEATURE_LONG_RESET, @@ -7395,10 +7364,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W29EE011", + .name = "W29C010(M)/W29C011A/W29EE011/W29EE012", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_29C011, + .model_id = WINBOND_W29C010, .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, @@ -7421,7 +7390,7 @@ struct flashchip flashchips[] = { .name = "W39V040A", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, - .model_id = W_39V040A, + .model_id = WINBOND_W39V040A, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, @@ -7444,10 +7413,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W39V040B", + .name = "W39V040(F)B", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, - .model_id = W_39V040B, + .model_id = WINBOND_W39V040B, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, @@ -7470,10 +7439,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W39V040C", + .name = "W39V040(F)C", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, - .model_id = W_39V040C, + .model_id = WINBOND_W39V040C, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, @@ -7500,7 +7469,7 @@ struct flashchip flashchips[] = { .name = "W39V040FA", .bustype = CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, - .model_id = W_39V040FA, + .model_id = WINBOND_W39V040FA, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, @@ -7531,7 +7500,7 @@ struct flashchip flashchips[] = { .name = "W39V080A", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, - .model_id = W_39V080A, + .model_id = WINBOND_W39V080A, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, @@ -7554,10 +7523,10 @@ struct flashchip flashchips[] = { { .vendor = "Winbond", - .name = "W49F002U", + .name = "W49F002U/N", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_49F002U, + .model_id = WINBOND_W49F002U, .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, @@ -7588,7 +7557,7 @@ struct flashchip flashchips[] = { .name = "W49F020", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = WINBOND_ID, - .model_id = W_49F020, + .model_id = WINBOND_W49F020, .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, @@ -7611,7 +7580,7 @@ struct flashchip flashchips[] = { .name = "W49V002A", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, - .model_id = W_49V002A, + .model_id = WINBOND_W49V002A, .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, @@ -7642,7 +7611,7 @@ struct flashchip flashchips[] = { .name = "W49V002FA", .bustype = CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, - .model_id = W_49V002FA, + .model_id = WINBOND_W49V002FA, .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, @@ -7673,7 +7642,7 @@ struct flashchip flashchips[] = { .name = "W39V080FA", .bustype = CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, - .model_id = W_39V080FA, + .model_id = WINBOND_W39V080FA, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, @@ -7700,7 +7669,7 @@ struct flashchip flashchips[] = { .name = "W39V080FA (dual mode)", .bustype = CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, - .model_id = W_39V080FA_DM, + .model_id = WINBOND_W39V080FA_DM, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, -- cgit v1.1