Author: uwe Date: 2008-03-13 19:52:51 +0100 (Thu, 13 Mar 2008) New Revision: 3139
Modified: trunk/util/flashrom/chipset_enable.c trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c trunk/util/flashrom/flashrom.c Log: Also print the chip vendor name in --list-supported output (trivial).
Cosmetic changes in some files, partly bending the 80-characters-per-line rule in this special case, as the 80-character-limited version looks equally crappy even in an 80x25 console/xterm, so let's make it at least look good in a high-resolution xterm.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/util/flashrom/chipset_enable.c =================================================================== --- trunk/util/flashrom/chipset_enable.c 2008-03-13 18:41:07 UTC (rev 3138) +++ trunk/util/flashrom/chipset_enable.c 2008-03-13 18:52:51 UTC (rev 3139) @@ -510,55 +510,56 @@ } FLASH_ENABLE;
static const FLASH_ENABLE enables[] = { - {0x1039, 0x0630, "SIS630", enable_flash_sis630}, - {0x8086, 0x7110, "PIIX4/PIIX4E/PIIX4M", enable_flash_piix4}, - {0x8086, 0x7198, "Intel 440MX", enable_flash_piix4}, - {0x8086, 0x2410, "ICH", enable_flash_ich_4e}, - {0x8086, 0x2420, "ICH0", enable_flash_ich_4e}, - {0x8086, 0x2440, "ICH2", enable_flash_ich_4e}, - {0x8086, 0x244c, "ICH2-M", enable_flash_ich_4e}, - {0x8086, 0x2480, "ICH3-S", enable_flash_ich_4e}, - {0x8086, 0x248c, "ICH3-M", enable_flash_ich_4e}, - {0x8086, 0x24c0, "ICH4/ICH4-L", enable_flash_ich_4e}, - {0x8086, 0x24cc, "ICH4-M", enable_flash_ich_4e}, - {0x8086, 0x24d0, "ICH5/ICH5R", enable_flash_ich_4e}, - {0x8086, 0x2640, "ICH6/ICH6R", enable_flash_ich_dc}, - {0x8086, 0x2641, "ICH6-M", enable_flash_ich_dc}, - {0x8086, 0x27b0, "ICH7DH", enable_flash_ich_dc}, - {0x8086, 0x27b8, "ICH7/ICH7R", enable_flash_ich_dc}, - {0x8086, 0x27b9, "ICH7M", enable_flash_ich_dc}, - {0x8086, 0x27bd, "ICH7MDH", enable_flash_ich_dc}, - {0x8086, 0x2810, "ICH8/ICH8R", enable_flash_ich_dc}, - {0x8086, 0x2812, "ICH8DH", enable_flash_ich_dc}, - {0x8086, 0x2814, "ICH8DO", enable_flash_ich_dc}, - {0x1106, 0x8231, "VT8231", enable_flash_vt823x}, - {0x1106, 0x3177, "VT8235", enable_flash_vt823x}, - {0x1106, 0x3227, "VT8237", enable_flash_vt823x}, - {0x1106, 0x8324, "CX700", enable_flash_vt823x}, - {0x1106, 0x0686, "VT82C686", enable_flash_amd8111}, - {0x1078, 0x0100, "CS5530/CS5530A", enable_flash_cs5530}, - {0x100b, 0x0510, "SC1100", enable_flash_sc1100}, - {0x1039, 0x0008, "SIS5595", enable_flash_sis5595}, - {0x1022, 0x2080, "AMD GEODE CS5536", enable_flash_cs5536}, - {0x1022, 0x7468, "AMD8111", enable_flash_amd8111}, - {0x10B9, 0x1533, "ALi M1533", enable_flash_ali_m1533}, - {0x10de, 0x0050, "NVIDIA CK804", enable_flash_ck804}, /* LPC */ - {0x10de, 0x0051, "NVIDIA CK804", enable_flash_ck804}, /* Pro */ - {0x10de, 0x00d3, "NVIDIA CK804", enable_flash_ck804}, /* Slave, should not be here, to fix known bug for A01. */ - {0x10de, 0x0260, "NVidia MCP51", enable_flash_ck804}, - {0x10de, 0x0261, "NVidia MCP51", enable_flash_ck804}, - {0x10de, 0x0262, "NVidia MCP51", enable_flash_ck804}, - {0x10de, 0x0263, "NVidia MCP51", enable_flash_ck804}, - {0x10de, 0x0360, "NVIDIA MCP55", enable_flash_mcp55}, /* M57SLI-S4 */ - {0x10de, 0x0361, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0362, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0363, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0364, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0365, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0366, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ - {0x10de, 0x0367, "NVIDIA MCP55", enable_flash_mcp55}, /* Pro */ - {0x1002, 0x4377, "ATI SB400", enable_flash_sb400}, - {0x1166, 0x0205, "Broadcom HT-1000", enable_flash_ht1000}, + {0x1039, 0x0630, "SiS630", enable_flash_sis630}, + {0x8086, 0x7110, "Intel PIIX4/4E/4M", enable_flash_piix4}, + {0x8086, 0x7198, "Intel 440MX", enable_flash_piix4}, + {0x8086, 0x2410, "Intel ICH", enable_flash_ich_4e}, + {0x8086, 0x2420, "Intel ICH0", enable_flash_ich_4e}, + {0x8086, 0x2440, "Intel ICH2", enable_flash_ich_4e}, + {0x8086, 0x244c, "Intel ICH2-M", enable_flash_ich_4e}, + {0x8086, 0x2480, "Intel ICH3-S", enable_flash_ich_4e}, + {0x8086, 0x248c, "Intel ICH3-M", enable_flash_ich_4e}, + {0x8086, 0x24c0, "Intel ICH4/ICH4-L", enable_flash_ich_4e}, + {0x8086, 0x24cc, "Intel ICH4-M", enable_flash_ich_4e}, + {0x8086, 0x24d0, "Intel ICH5/ICH5R", enable_flash_ich_4e}, + {0x8086, 0x2640, "Intel ICH6/ICH6R", enable_flash_ich_dc}, + {0x8086, 0x2641, "Intel ICH6-M", enable_flash_ich_dc}, + {0x8086, 0x27b0, "Intel ICH7DH", enable_flash_ich_dc}, + {0x8086, 0x27b8, "Intel ICH7/ICH7R", enable_flash_ich_dc}, + {0x8086, 0x27b9, "Intel ICH7M", enable_flash_ich_dc}, + {0x8086, 0x27bd, "Intel ICH7MDH", enable_flash_ich_dc}, + {0x8086, 0x2810, "Intel ICH8/ICH8R", enable_flash_ich_dc}, + {0x8086, 0x2812, "Intel ICH8DH", enable_flash_ich_dc}, + {0x8086, 0x2814, "Intel ICH8DO", enable_flash_ich_dc}, + {0x1106, 0x8231, "VIA VT8231", enable_flash_vt823x}, + {0x1106, 0x3177, "VIA VT8235", enable_flash_vt823x}, + {0x1106, 0x3227, "VIA VT8237", enable_flash_vt823x}, + {0x1106, 0x8324, "VIA CX700", enable_flash_vt823x}, + {0x1106, 0x0686, "VIA VT82C686", enable_flash_amd8111}, + {0x1078, 0x0100, "AMD CS5530(A)", enable_flash_cs5530}, + {0x100b, 0x0510, "AMD SC1100", enable_flash_sc1100}, + {0x1039, 0x0008, "SiS5595", enable_flash_sis5595}, + {0x1022, 0x2080, "AMD CS5536", enable_flash_cs5536}, + {0x1022, 0x7468, "AMD8111", enable_flash_amd8111}, + {0x10B9, 0x1533, "ALi M1533", enable_flash_ali_m1533}, + {0x10de, 0x0050, "NVIDIA CK804", enable_flash_ck804}, /* LPC */ + {0x10de, 0x0051, "NVIDIA CK804", enable_flash_ck804}, /* Pro */ + /* Slave, should not be here, to fix known bug for A01. */ + {0x10de, 0x00d3, "NVIDIA CK804", enable_flash_ck804}, + {0x10de, 0x0260, "NVIDIA MCP51", enable_flash_ck804}, + {0x10de, 0x0261, "NVIDIA MCP51", enable_flash_ck804}, + {0x10de, 0x0262, "NVIDIA MCP51", enable_flash_ck804}, + {0x10de, 0x0263, "NVIDIA MCP51", enable_flash_ck804}, + {0x10de, 0x0360, "NVIDIA MCP55", enable_flash_mcp55}, /* M57SLI*/ + {0x10de, 0x0361, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0362, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0363, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0364, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0365, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0366, "NVIDIA MCP55", enable_flash_mcp55}, /* LPC */ + {0x10de, 0x0367, "NVIDIA MCP55", enable_flash_mcp55}, /* Pro */ + {0x1002, 0x4377, "ATI SB400", enable_flash_sb400}, + {0x1166, 0x0205, "Broadcom HT-1000", enable_flash_ht1000}, };
void print_supported_chipsets(void)
Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2008-03-13 18:41:07 UTC (rev 3138) +++ trunk/util/flashrom/flash.h 2008-03-13 18:52:51 UTC (rev 3139) @@ -33,6 +33,7 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
struct flashchip { + const char *vendor; const char *name; /* With 32bit manufacture_id and model_id we can cover IDs up to * (including) the 4th bank of JEDEC JEP106W Standard Manufacturer's
Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2008-03-13 18:41:07 UTC (rev 3138) +++ trunk/util/flashrom/flashchips.c 2008-03-13 18:52:51 UTC (rev 3139) @@ -26,202 +26,107 @@ #endif
struct flashchip flashchips[] = { - {"Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024, - probe_29f040b, erase_29f040b, write_29f040b}, - {"Am29LV040B", AMD_ID, AM_29LV040B, 512, 64 * 1024, - probe_29f040b, erase_29f040b, write_29f040b}, - {"Am29F016D", AMD_ID, AM_29F016D, 2048, 64 * 1024, - probe_29f040b, erase_29f040b, write_29f040b}, - {"AE49F2008", ASD_ID, ASD_AE49F2008, 256, 128, - probe_jedec, erase_chip_jedec, write_jedec}, - {"At29C040A", ATMEL_ID, AT_29C040A, 512, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"At29C020", ATMEL_ID, AT_29C020, 256, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"At49F002(N)", ATMEL_ID, AT_49F002N, 256, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"At49F002(N)T",ATMEL_ID, AT_49F002NT, 256, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"MBM29F400TC", FUJITSU_ID, MBM29F400TC_STRANGE, 512, 64 * 1024, - probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, - {"MX29F002", MX_ID, MX_29F002, 256, 64 * 1024, - probe_29f002, erase_29f002, write_29f002}, - {"MX25L4005", MX_ID, MX_25L4005, 512, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"MX25L8005", MX_ID, MX_25L8005, 1024, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"MX25L3205", MX_ID, MX_25L3205, 4096, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"S25FL016A", SPANSION_ID, SPANSION_S25FL016A, 2048, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST25VF040B", SST_ID, SST_25VF040B, 512, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST25VF016B", SST_ID, SST_25VF016B, 2048, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"SST29EE020A", SST_ID, SST_29EE020A, 256, 128, - probe_jedec, erase_chip_jedec, write_jedec}, - {"SST28SF040A", SST_ID, SST_28SF040, 512, 256, - probe_28sf040, erase_28sf040, write_28sf040}, - {"SST39SF010A", SST_ID, SST_39SF010, 128, 4096, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST39SF020A", SST_ID, SST_39SF020, 256, 4096, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST39SF040", SST_ID, SST_39SF040, 512, 4096, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"SST39VF020", SST_ID, SST_39VF020, 256, 4096, - probe_jedec, erase_chip_jedec, write_39sf020}, + /******************************************************************************************************************************************************************************************************/ + /* Vendor Chip Vendor ID Chip ID TODO TODO Probe function Erase function Write function Read function */ + /******************************************************************************************************************************************************************************************************/ + {"AMD", "Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, + {"AMD", "Am29LV040B", AMD_ID, AM_29LV040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, + {"AMD", "Am29F016D", AMD_ID, AM_29F016D, 2048, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, + {"ASD", "AE49F2008", ASD_ID, ASD_AE49F2008, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, + {"Atmel", "At29C040A", ATMEL_ID, AT_29C040A, 512, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"Atmel", "At29C020", ATMEL_ID, AT_29C020, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"Atmel", "At49F002(N)", ATMEL_ID, AT_49F002N, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"Atmel", "At49F002(N)T", ATMEL_ID, AT_49F002NT, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"EON", "EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"EON", "EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"Fujitsu", "MBM29F400TC", FUJITSU_ID, MBM29F400TC_STRANGE, 512, 64 * 1024, probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, + {"Macronix", "MX29F002", MX_ID, MX_29F002, 256, 64 * 1024, probe_29f002, erase_29f002, write_29f002}, + {"Macronix", "MX25L4005", MX_ID, MX_25L4005, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Macronix", "MX25L8005", MX_ID, MX_25L8005, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Macronix", "MX25L3205", MX_ID, MX_25L3205, 4096, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Spansion", "S25FL016A", SPANSION_ID, SPANSION_S25FL016A, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST", "SST25VF040B", SST_ID, SST_25VF040B, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST", "SST25VF016B", SST_ID, SST_25VF016B, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"SST", "SST29EE020A", SST_ID, SST_29EE020A, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, + {"SST", "SST28SF040A", SST_ID, SST_28SF040, 512, 256, probe_28sf040, erase_28sf040, write_28sf040}, + {"SST", "SST39SF010A", SST_ID, SST_39SF010, 128, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST", "SST39SF020A", SST_ID, SST_39SF020, 256, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST", "SST39SF040", SST_ID, SST_39SF040, 512, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, + {"SST", "SST39VF020", SST_ID, SST_39VF020, 256, 4096, probe_jedec, erase_chip_jedec, write_39sf020}, // assume similar to 004B, ignoring data sheet - {"SST49LF040B", SST_ID, SST_49LF040B, 512, 64 * 1024, - probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - - {"SST49LF040", SST_ID, SST_49LF040, 512, 4096, - probe_jedec, erase_49lf040, write_49lf040}, - {"SST49LF020A", SST_ID, SST_49LF020A, 256, 16 * 1024, - probe_jedec, erase_49lf040, write_49lf040}, - {"SST49LF080A", SST_ID, SST_49LF080A, 1024, 4096, - probe_jedec, erase_49lf040, write_49lf040}, - {"SST49LF002A/B", SST_ID, SST_49LF002A, 256, 16 * 1024, - probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST49LF003A/B", SST_ID, SST_49LF003A, 384, 64 * 1024, - probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST49LF004A/B", SST_ID, SST_49LF004A, 512, 64 * 1024, - probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST49LF008A", SST_ID, SST_49LF008A, 1024, 64 * 1024 , - probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, - {"SST49LF004C", SST_ID, SST_49LF004C, 512, 4 * 1024, - probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST49LF008C", SST_ID, SST_49LF008C, 1024, 4 * 1024 , - probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST49LF016C", SST_ID, SST_49LF016C, 2048, 4 * 1024 , - probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024 , - probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"Pm49FL002", PMC_ID_NOPREFIX, PMC_49FL002, 256, 16 * 1024, - probe_jedec, erase_chip_jedec, write_49fl004}, - {"Pm49FL004", PMC_ID_NOPREFIX, PMC_49FL004, 512, 64 * 1024, - probe_jedec, erase_chip_jedec, write_49fl004}, - {"Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"W29C011", WINBOND_ID, W_29C011, 128, 128, - probe_jedec, erase_chip_jedec, write_jedec}, - {"W29C040P", WINBOND_ID, W_29C040P, 512, 256, - probe_jedec, erase_chip_jedec, write_jedec}, - {"W29C020C", WINBOND_ID, W_29C020C, 256, 128, - probe_jedec, erase_chip_jedec, write_jedec}, - {"W29EE011", WINBOND_ID, W_29C011, 128, 128, - probe_w29ee011,erase_chip_jedec, write_jedec}, - {"W49F002U", WINBOND_ID, W_49F002U, 256, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"W49V002A", WINBOND_ID, W_49V002A, 256, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"W49V002FA", WINBOND_ID, W_49V002FA, 256, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"W39V040FA", WINBOND_ID, W_39V040FA, 512, 64*1024, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"W39V040A", WINBOND_ID, W_39V040A, 512, 64*1024, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"W39V040B", WINBOND_ID, W_39V040B, 512, 64*1024, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"W39V080A", WINBOND_ID, W_39V080A, 1024, 64*1024, - probe_jedec, erase_chip_jedec, write_39sf020}, - {"W25x10", WINBOND_NEX_ID, W_25X10, 128, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"W25x20", WINBOND_NEX_ID, W_25X20, 256, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"W25x40", WINBOND_NEX_ID, W_25X40, 512, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"W25x80", WINBOND_NEX_ID, W_25X80, 1024, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M29F002B", ST_ID, ST_M29F002B, 256, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FW040", ST_ID, ST_M50FW040, 512, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M29W040B", ST_ID, ST_M29W040B, 512, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M29F002T/NT", ST_ID, ST_M29F002T, 256, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M29F400BT", ST_ID, ST_M29F400BT, 512, 64 * 1024, - probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, - {"M50FLW040A", ST_ID, ST_M50FLW040A, 512, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FLW040B", ST_ID, ST_M50FLW040B, 512, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FLW080A", ST_ID, ST_M50FLW080A, 1024, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FLW080B", ST_ID, ST_M50FLW080B, 1024, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FW080", ST_ID, ST_M50FW080, 1024, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50FW016", ST_ID, ST_M50FW016, 2048, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M50LPW116", ST_ID, ST_M50LPW116, 2048, 64 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M29W010B", ST_ID, ST_M29W010B, 128, 16 * 1024, - probe_jedec, erase_chip_jedec, write_jedec}, - {"M29F040B", ST_ID, ST_M29F040B, 512, 64 * 1024, - probe_29f040b, erase_29f040b, write_29f040b}, - {"M25P05-A", ST_ID, ST_M25P05A, 64, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P10-A", ST_ID, ST_M25P10A, 128, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P20", ST_ID, ST_M25P20, 256, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P40", ST_ID, ST_M25P40, 512, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P80", ST_ID, ST_M25P80, 1024, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P16", ST_ID, ST_M25P16, 2048, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P32", ST_ID, ST_M25P32, 4096, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P64", ST_ID, ST_M25P64, 8192, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"M25P128", ST_ID, ST_M25P128, 16384, 256, - probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, - {"82802ab", INTEL_ID, 173, 512, 64 * 1024, - probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"82802ac", INTEL_ID, 172, 1024, 64 * 1024, - probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096, - probe_jedec, erase_chip_jedec, write_49f002}, + {"SST", "SST49LF040B", SST_ID, SST_49LF040B, 512, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST", "SST49LF040", SST_ID, SST_49LF040, 512, 4096, probe_jedec, erase_49lf040, write_49lf040}, + {"SST", "SST49LF020A", SST_ID, SST_49LF020A, 256, 16 * 1024, probe_jedec, erase_49lf040, write_49lf040}, + {"SST", "SST49LF080A", SST_ID, SST_49LF080A, 1024, 4096, probe_jedec, erase_49lf040, write_49lf040}, + {"SST", "SST49LF002A/B", SST_ID, SST_49LF002A, 256, 16 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST", "SST49LF003A/B", SST_ID, SST_49LF003A, 384, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST", "SST49LF004A/B", SST_ID, SST_49LF004A, 512, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST", "SST49LF008A", SST_ID, SST_49LF008A, 1024, 64 * 1024, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub}, + {"SST", "SST49LF004C", SST_ID, SST_49LF004C, 512, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST", "SST49LF008C", SST_ID, SST_49LF008C, 1024, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST", "SST49LF016C", SST_ID, SST_49LF016C, 2048, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"SST", "SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, + {"PMC", "Pm49FL002", PMC_ID_NOPREFIX,PMC_49FL002, 256, 16 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, + {"PMC", "Pm49FL004", PMC_ID_NOPREFIX,PMC_49FL004, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, + {"PMC", "Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"PMC", "Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"PMC", "Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"PMC", "Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"PMC", "Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"PMC", "Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Winbond", "W29C011", WINBOND_ID, W_29C011, 128, 128, probe_jedec, erase_chip_jedec, write_jedec}, + {"Winbond", "W29C040P", WINBOND_ID, W_29C040P, 512, 256, probe_jedec, erase_chip_jedec, write_jedec}, + {"Winbond", "W29C020C", WINBOND_ID, W_29C020C, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, + {"Winbond", "W29EE011", WINBOND_ID, W_29C011, 128, 128, probe_w29ee011, erase_chip_jedec, write_jedec}, + {"Winbond", "W49F002U", WINBOND_ID, W_49F002U, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"Winbond", "W49V002A", WINBOND_ID, W_49V002A, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"Winbond", "W49V002FA", WINBOND_ID, W_49V002FA, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"Winbond", "W39V040FA", WINBOND_ID, W_39V040FA, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, + {"Winbond", "W39V040A", WINBOND_ID, W_39V040A, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, + {"Winbond", "W39V040B", WINBOND_ID, W_39V040B, 512, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, + {"Winbond", "W39V080A", WINBOND_ID, W_39V080A, 1024, 64*1024, probe_jedec, erase_chip_jedec, write_39sf020}, + {"Winbond/N.", "W25x10", WINBOND_NEX_ID, W_25X10, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Winbond/N.", "W25x20", WINBOND_NEX_ID, W_25X20, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Winbond/N.", "W25x40", WINBOND_NEX_ID, W_25X40, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Winbond/N.", "W25x80", WINBOND_NEX_ID, W_25X80, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M29F002B", ST_ID, ST_M29F002B, 256, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FW040", ST_ID, ST_M50FW040, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M29W040B", ST_ID, ST_M29W040B, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M29F002T/NT", ST_ID, ST_M29F002T, 256, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M29F400BT", ST_ID, ST_M29F400BT, 512, 64 * 1024, probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, + {"ST", "M50FLW040A", ST_ID, ST_M50FLW040A, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FLW040B", ST_ID, ST_M50FLW040B, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FLW080A", ST_ID, ST_M50FLW080A, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FLW080B", ST_ID, ST_M50FLW080B, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FW080", ST_ID, ST_M50FW080, 1024, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50FW016", ST_ID, ST_M50FW016, 2048, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M50LPW116", ST_ID, ST_M50LPW116, 2048, 64 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M29W010B", ST_ID, ST_M29W010B, 128, 16 * 1024, probe_jedec, erase_chip_jedec, write_jedec}, + {"ST", "M29F040B", ST_ID, ST_M29F040B, 512, 64 * 1024, probe_29f040b, erase_29f040b, write_29f040b}, + {"ST", "M25P05-A", ST_ID, ST_M25P05A, 64, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P10-A", ST_ID, ST_M25P10A, 128, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P20", ST_ID, ST_M25P20, 256, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P40", ST_ID, ST_M25P40, 512, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P80", ST_ID, ST_M25P80, 1024, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P16", ST_ID, ST_M25P16, 2048, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P32", ST_ID, ST_M25P32, 4096, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P64", ST_ID, ST_M25P64, 8192, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"ST", "M25P128", ST_ID, ST_M25P128, 16384, 256, probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Intel", "82802ab", INTEL_ID, 173, 512, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"Intel", "82802ac", INTEL_ID, 172, 1024, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"EMST", "F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096, probe_jedec, erase_chip_jedec, write_49f002}, #ifndef DISABLE_DOC - {"MD-2802 (M-Systems DiskOnChip Millennium Module)", - MSYSTEMS_ID, MSYSTEMS_MD2802,8, 8 * 1024, - probe_md2802, erase_md2802, write_md2802, read_md2802}, + {"M-Systems", "MD-2802", MSYSTEMS_ID, MSYSTEMS_MD2802, 8, 8 * 1024, probe_md2802, erase_md2802, write_md2802, read_md2802}, #endif - {"LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024, - probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, - {"S29C51001T", SYNCMOS_ID, S29C51001T, 128, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"S29C51002T", SYNCMOS_ID, S29C51002T, 256, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"S29C51004T", SYNCMOS_ID, S29C51004T, 512, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"S29C31004T", SYNCMOS_ID, S29C31004T, 512, 128, - probe_jedec, erase_chip_jedec, write_49f002}, - {"EON unknown SPI chip", EON_ID_NOPREFIX, GENERIC_DEVICE_ID, 0, 0, - probe_spi, NULL, NULL}, - {"MX unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, - probe_spi, NULL, NULL}, - {"PMC unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, - probe_spi, NULL, NULL}, - {"SST unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, - probe_spi, NULL, NULL}, - {"ST unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, - probe_spi, NULL, NULL}, + {"Sharp", "LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024, probe_lhf00l04, erase_lhf00l04, write_lhf00l04}, + {"SyncMOS", "S29C51001T", SYNCMOS_ID, S29C51001T, 128, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"SyncMOS", "S29C51002T", SYNCMOS_ID, S29C51002T, 256, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"SyncMOS", "S29C51004T", SYNCMOS_ID, S29C51004T, 512, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"SyncMOS", "S29C31004T", SYNCMOS_ID, S29C31004T, 512, 128, probe_jedec, erase_chip_jedec, write_49f002}, + {"EON", "unknown SPI chip", EON_ID_NOPREFIX,GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"Macronix", "unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"PMC", "unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"SST", "unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"ST", "unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, {NULL,} };
Modified: trunk/util/flashrom/flashrom.c =================================================================== --- trunk/util/flashrom/flashrom.c 2008-03-13 18:41:07 UTC (rev 3138) +++ trunk/util/flashrom/flashrom.c 2008-03-13 18:52:51 UTC (rev 3139) @@ -200,7 +200,7 @@ printf("Supported ROM chips:\n\n");
for (i = 0; flashchips[i].name != NULL; i++) - printf("%s\n", flashchips[i].name); + printf("%s %s\n", flashchips[i].vendor, flashchips[i].name); }
void usage(const char *name)