flashrom June 2011

flashrom@flashrom.org

50 participants
297 discussions

[PATCH] Confirm EN29LV800 bus, timing, and page size
by TJ 02 Aug '11

02 Aug '11

Uncertain values now confirmed. If you're happy with the new EN29LV800 code I'll submit a combined patch with a Signed-off-by tag. --- flashchips.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flashchips.c b/flashchips.c index b5be180..10b8dea 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2166,15 +2166,15 @@ struct flashchip flashchips[] = { { .vendor = "EON", .name = "EN29LV800(B)(C)B", - .bustype = CHIP_BUSTYPE_UNKNOWN, + .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = EON_ID, .model_id = EN_29LV800B, .total_size = 1024, - .page_size = 1024, // TODO: check this + .page_size = 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_ZERO, /* TODO: check Datasheet has no timing info specified */ + .probe_timing = TIMING_ZERO, .erase = NULL, .block_erasers = { @@ -2198,15 +2198,15 @@ struct flashchip flashchips[] = { { .vendor = "EON", .name = "EN29LV800(B)(C)T", - .bustype = CHIP_BUSTYPE_UNKNOWN, + .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = EON_ID, .model_id = EN_29LV800T, .total_size = 1024, - .page_size = 1024, // TODO: check this + .page_size = 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_ZERO, /* TODO: check Datasheet has no timing info specified */ + .probe_timing = TIMING_ZERO, .erase = NULL, .block_erasers = { -- 1.6.3.3

4 5

Re: [flashrom] [PATCH 3/8] generify spi_rdid to allow passing different opcodes. This is needed to add support for Atmel's AT25F series.
by Carl-Daniel Hailfinger 29 Jul '11

29 Jul '11

Am 15.03.2011 16:29 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner<stefan.tauner(a)student.tuwien.ac.at> > Not sure about this one. We also have separate functions for each erase command. I'll let others comment. Regards, Carl-Daniel > --- > spi25.c | 24 ++++++++++++------------ > 1 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/spi25.c b/spi25.c > index 5d73411..c4cd6b2 100644 > --- a/spi25.c > +++ b/spi25.c > @@ -31,17 +31,17 @@ > > void spi_prettyprint_status_register(struct flashchip *flash); > > -static int spi_rdid(unsigned char *readarr, int bytes) > +static int spi_rdid(unsigned char *readarr, int bytes_in, unsigned char rdid_opcode) > { > - static const unsigned char cmd[JEDEC_RDID_OUTSIZE] = { JEDEC_RDID }; > + unsigned char cmd[] = { rdid_opcode }; > int ret; > int i; > > - ret = spi_send_command(sizeof(cmd), bytes, cmd, readarr); > + ret = spi_send_command(sizeof(cmd), bytes_in, cmd, readarr); > if (ret) > return ret; > msg_cspew("RDID returned"); > - for (i = 0; i< bytes; i++) > + for (i = 0; i< bytes_in; i++) > msg_cspew(" 0x%02x", readarr[i]); > msg_cspew(". "); > return 0; > @@ -115,13 +115,13 @@ int spi_write_disable(void) > return spi_send_command(sizeof(cmd), 0, cmd, NULL); > } > > -static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > +static int probe_spi_rdid_generic(struct flashchip *flash, int bytes_in, unsigned char rdid_opcode) > { > - unsigned char readarr[4]; > + unsigned char readarr[bytes_in]; > uint32_t id1; > uint32_t id2; > > - if (spi_rdid(readarr, bytes)) > + if (spi_rdid(readarr, bytes_in, rdid_opcode)) > return 0; > > if (!oddparity(readarr[0])) > @@ -135,7 +135,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > msg_cdbg("RDID byte 1 parity violation. "); > id1 = (readarr[0]<< 8) | readarr[1]; > id2 = readarr[2]; > - if (bytes> 3) { > + if (bytes_in> 3) { > id2<<= 8; > id2 |= readarr[3]; > } > @@ -170,7 +170,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > > int probe_spi_rdid(struct flashchip *flash) > { > - return probe_spi_rdid_generic(flash, 3); > + return probe_spi_rdid_generic(flash, JEDEC_RDID_INSIZE, JEDEC_RDID); > } > > int probe_spi_rdid4(struct flashchip *flash) > @@ -189,7 +189,7 @@ int probe_spi_rdid4(struct flashchip *flash) > #endif > #endif > default: > - return probe_spi_rdid_generic(flash, 4); > + return probe_spi_rdid_generic(flash, 4, JEDEC_RDID); > } > > return 0; > @@ -242,8 +242,8 @@ int probe_spi_res1(struct flashchip *flash) > /* Check if RDID is usable and does not return 0xff 0xff 0xff or > * 0x00 0x00 0x00. In that case, RES is pointless. > */ > - if (!spi_rdid(readarr, 3)&& memcmp(readarr, allff, 3)&& > - memcmp(readarr, all00, 3)) { > + if (!spi_rdid(readarr, JEDEC_RDID_INSIZE, JEDEC_RDID)&& memcmp(readarr, allff, 3)&& > + memcmp(readarr, all00, JEDEC_RDID_INSIZE)) { > msg_cdbg("Ignoring RES in favour of RDID.\n"); > return 0; > } > -- http://www.hailfinger.org/

2 1

[PATCH] Rename CHIP_BUSTYPE_FOO to BUS_FOO
by Carl-Daniel Hailfinger 27 Jul '11

27 Jul '11

Rename CHIP_BUSTYPE_FOO to BUS_FOO. It's shorter to type, and we have less problems with the 80 column limit. That said, it will conflict with _all_ patches pending in flashchips.c, and I'd like to postpone it until we have those patches in. Comments? Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-chip_bustype_foo_rename/flash.h =================================================================== --- flashrom-chip_bustype_foo_rename/flash.h (Revision 1327) +++ flashrom-chip_bustype_foo_rename/flash.h (Arbeitskopie) @@ -57,13 +57,13 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) enum chipbustype { - CHIP_BUSTYPE_NONE = 0, - CHIP_BUSTYPE_PARALLEL = 1 << 0, - CHIP_BUSTYPE_LPC = 1 << 1, - CHIP_BUSTYPE_FWH = 1 << 2, - CHIP_BUSTYPE_SPI = 1 << 3, - CHIP_BUSTYPE_NONSPI = CHIP_BUSTYPE_PARALLEL | CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, - CHIP_BUSTYPE_UNKNOWN = CHIP_BUSTYPE_PARALLEL | CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_SPI, + BUS_NONE = 0, + BUS_PARALLEL = 1 << 0, + BUS_LPC = 1 << 1, + BUS_FWH = 1 << 2, + BUS_SPI = 1 << 3, + BUS_NONSPI = BUS_PARALLEL | BUS_LPC | BUS_FWH, + BUS_UNKNOWN = BUS_PARALLEL | BUS_LPC | BUS_FWH | BUS_SPI, }; /* Index: flashrom-chip_bustype_foo_rename/drkaiser.c =================================================================== --- flashrom-chip_bustype_foo_rename/drkaiser.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/drkaiser.c (Arbeitskopie) @@ -53,7 +53,7 @@ drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", addr, 128 * 1024); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; return 0; } Index: flashrom-chip_bustype_foo_rename/it87spi.c =================================================================== --- flashrom-chip_bustype_foo_rename/it87spi.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/it87spi.c (Arbeitskopie) @@ -193,7 +193,7 @@ free(portpos); exit_conf_mode_ite(port); it8716f_flashport = flashport; - if (buses_supported & CHIP_BUSTYPE_SPI) + if (buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ register_spi_programmer(&spi_programmer_it87xx); Index: flashrom-chip_bustype_foo_rename/gfxnvidia.c =================================================================== --- flashrom-chip_bustype_foo_rename/gfxnvidia.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/gfxnvidia.c (Arbeitskopie) @@ -78,7 +78,7 @@ nvidia_bar = physmap("NVIDIA", io_base_addr, 16 * 1024 * 1024); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* Write/erase doesn't work. */ programmer_may_write = 0; Index: flashrom-chip_bustype_foo_rename/nicrealtek.c =================================================================== --- flashrom-chip_bustype_foo_rename/nicrealtek.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/nicrealtek.c (Arbeitskopie) @@ -42,7 +42,7 @@ io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; return 0; } Index: flashrom-chip_bustype_foo_rename/serprog.c =================================================================== --- flashrom-chip_bustype_foo_rename/serprog.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/serprog.c (Arbeitskopie) @@ -452,7 +452,7 @@ if (sp_docommand(S_CMD_Q_BUSTYPE, 0, NULL, 1, &c)) { msg_perr("Warning: NAK to query supported buses\n"); - c = CHIP_BUSTYPE_NONSPI; /* A reasonable default for now. */ + c = BUS_NONSPI; /* A reasonable default for now. */ } buses_supported = c; Index: flashrom-chip_bustype_foo_rename/satamv.c =================================================================== --- flashrom-chip_bustype_foo_rename/satamv.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/satamv.c (Arbeitskopie) @@ -125,7 +125,7 @@ mv_iobar = tmp & 0xffff; msg_pspew("Activating I/O BAR at 0x%04x\n", mv_iobar); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* 512 kByte with two 8-bit latches, and * 4 MByte with additional 3-bit latch. */ Index: flashrom-chip_bustype_foo_rename/dummyflasher.c =================================================================== --- flashrom-chip_bustype_foo_rename/dummyflasher.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/dummyflasher.c (Arbeitskopie) @@ -90,24 +90,24 @@ /* Convert the parameters to lowercase. */ tolower_string(bustext); - buses_supported = CHIP_BUSTYPE_NONE; + buses_supported = BUS_NONE; if (strstr(bustext, "parallel")) { - buses_supported |= CHIP_BUSTYPE_PARALLEL; + buses_supported |= BUS_PARALLEL; msg_pdbg("Enabling support for %s flash.\n", "parallel"); } if (strstr(bustext, "lpc")) { - buses_supported |= CHIP_BUSTYPE_LPC; + buses_supported |= BUS_LPC; msg_pdbg("Enabling support for %s flash.\n", "LPC"); } if (strstr(bustext, "fwh")) { - buses_supported |= CHIP_BUSTYPE_FWH; + buses_supported |= BUS_FWH; msg_pdbg("Enabling support for %s flash.\n", "FWH"); } if (strstr(bustext, "spi")) { register_spi_programmer(&spi_programmer_dummyflasher); msg_pdbg("Enabling support for %s flash.\n", "SPI"); } - if (buses_supported == CHIP_BUSTYPE_NONE) + if (buses_supported == BUS_NONE) msg_pdbg("Support for all flash bus types disabled.\n"); free(bustext); Index: flashrom-chip_bustype_foo_rename/internal.c =================================================================== --- flashrom-chip_bustype_foo_rename/internal.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/internal.c (Arbeitskopie) @@ -182,7 +182,7 @@ /* Default to Parallel/LPC/FWH flash devices. If a known host controller * is found, the init routine sets the buses_supported bitfield. */ - buses_supported = CHIP_BUSTYPE_NONSPI; + buses_supported = BUS_NONSPI; /* Initialize PCI access for flash enables */ pacc = pci_alloc(); /* Get the pci_access structure */ Index: flashrom-chip_bustype_foo_rename/ichspi.c =================================================================== --- flashrom-chip_bustype_foo_rename/ichspi.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/ichspi.c (Arbeitskopie) @@ -1256,7 +1256,7 @@ ich_spibar = physmap("VT8237S MMIO registers", mmio_base, 0x70); /* Not sure if it speaks all these bus protocols. */ - buses_supported = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH; + buses_supported = BUS_LPC | BUS_FWH; register_spi_programmer(&spi_programmer_via); msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); Index: flashrom-chip_bustype_foo_rename/nicnatsemi.c =================================================================== --- flashrom-chip_bustype_foo_rename/nicnatsemi.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/nicnatsemi.c (Arbeitskopie) @@ -41,7 +41,7 @@ io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_natsemi); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* The datasheet shows address lines MA0-MA16 in one place and MA0-MA15 * in another. My NIC has MA16 connected to A16 on the boot ROM socket Index: flashrom-chip_bustype_foo_rename/it85spi.c =================================================================== --- flashrom-chip_bustype_foo_rename/it85spi.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/it85spi.c (Arbeitskopie) @@ -282,7 +282,7 @@ { int ret; - if (!(buses_supported & CHIP_BUSTYPE_FWH)) { + if (!(buses_supported & BUS_FWH)) { msg_pdbg("%s():%d buses not support FWH\n", __func__, __LINE__); return 1; } @@ -291,7 +291,7 @@ if (!ret) { msg_pdbg("%s():%d buses_supported=0x%x\n", __func__, __LINE__, buses_supported); - if (buses_supported & CHIP_BUSTYPE_FWH) + if (buses_supported & BUS_FWH) msg_pdbg("Overriding chipset SPI with IT85 FWH|SPI.\n"); /* Really leave FWH enabled? */ /* Set this as spi controller. */ Index: flashrom-chip_bustype_foo_rename/atahpt.c =================================================================== --- flashrom-chip_bustype_foo_rename/atahpt.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/atahpt.c (Arbeitskopie) @@ -51,7 +51,7 @@ reg32 |= (1 << 24); rpci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; return 0; } Index: flashrom-chip_bustype_foo_rename/flashchips.c =================================================================== --- flashrom-chip_bustype_foo_rename/flashchips.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/flashchips.c (Arbeitskopie) @@ -60,7 +60,7 @@ { .vendor = "AMD", .name = "Am29F010A/B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F010B, /* Same as Am29F010A */ .total_size = 128, @@ -87,7 +87,7 @@ { .vendor = "AMD", .name = "Am29F002(N)BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F002BB, .total_size = 256, @@ -119,7 +119,7 @@ { .vendor = "AMD", .name = "Am29F002(N)BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F002BT, .total_size = 256, @@ -150,7 +150,7 @@ { .vendor = "AMD", .name = "Am29F016D", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F016D, .total_size = 2 * 1024, @@ -177,7 +177,7 @@ { .vendor = "AMD", .name = "Am29F040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F040B, .total_size = 512, @@ -204,7 +204,7 @@ { .vendor = "AMD", .name = "Am29F080B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F080B, .total_size = 1024, @@ -231,7 +231,7 @@ { .vendor = "AMD", .name = "Am29LV001BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV001BB, .total_size = 128, @@ -261,7 +261,7 @@ { .vendor = "AMD", .name = "Am29LV001BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV001BT, .total_size = 128, @@ -291,7 +291,7 @@ { .vendor = "AMD", .name = "Am29LV002BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV002BB, .total_size = 256, @@ -322,7 +322,7 @@ { .vendor = "AMD", .name = "Am29LV002BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV002BT, .total_size = 256, @@ -353,7 +353,7 @@ { .vendor = "AMD", .name = "Am29LV004BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV004BB, .total_size = 512, @@ -384,7 +384,7 @@ { .vendor = "AMD", .name = "Am29LV004BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV004BT, .total_size = 512, @@ -415,7 +415,7 @@ { .vendor = "AMD", .name = "Am29LV008BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV008BB, .total_size = 1024, @@ -446,7 +446,7 @@ { .vendor = "AMD", .name = "Am29LV008BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV008BT, .total_size = 1024, @@ -477,7 +477,7 @@ { .vendor = "AMD", .name = "Am29LV040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV040B, .total_size = 512, @@ -504,7 +504,7 @@ { .vendor = "AMD", .name = "Am29LV081B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV080B, .total_size = 1024, @@ -531,7 +531,7 @@ { .vendor = "AMIC", .name = "A25L05PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L05PT, .total_size = 64, @@ -564,7 +564,7 @@ { .vendor = "AMIC", .name = "A25L05PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L05PU, .total_size = 64, @@ -596,7 +596,7 @@ { .vendor = "AMIC", .name = "A25L10PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L10PT, .total_size = 128, @@ -630,7 +630,7 @@ { .vendor = "AMIC", .name = "A25L10PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L10PU, .total_size = 128, @@ -664,7 +664,7 @@ { .vendor = "AMIC", .name = "A25L20PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L20PT, .total_size = 256, @@ -698,7 +698,7 @@ { .vendor = "AMIC", .name = "A25L20PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L20PU, .total_size = 256, @@ -737,7 +737,7 @@ { .vendor = "AMIC", .name = "A25L40PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L40PT, .total_size = 512, @@ -771,7 +771,7 @@ { .vendor = "AMIC", .name = "A25L40PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L40PU, .total_size = 512, @@ -805,7 +805,7 @@ { .vendor = "AMIC", .name = "A25L80P", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L80P, .total_size = 1024, @@ -839,7 +839,7 @@ { .vendor = "AMIC", .name = "A25L16PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L16PT, .total_size = 2048, @@ -876,7 +876,7 @@ { .vendor = "AMIC", .name = "A25L16PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L16PU, .total_size = 2048, @@ -913,7 +913,7 @@ { .vendor = "AMIC", .name = "A25L512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L512, .total_size = 64, @@ -945,7 +945,7 @@ { .vendor = "AMIC", .name = "A25L010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L010, .total_size = 128, @@ -977,7 +977,7 @@ { .vendor = "AMIC", .name = "A25L020", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L020, .total_size = 256, @@ -1009,7 +1009,7 @@ { .vendor = "AMIC", .name = "A25L040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L040, .total_size = 512, @@ -1041,7 +1041,7 @@ { .vendor = "AMIC", .name = "A25L080", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L080, .total_size = 1024, @@ -1073,7 +1073,7 @@ { .vendor = "AMIC", .name = "A25L016", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L016, .total_size = 2048, @@ -1105,7 +1105,7 @@ { .vendor = "AMIC", .name = "A25L032", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L032, .total_size = 4096, @@ -1143,7 +1143,7 @@ { .vendor = "AMIC", .name = "A25LQ032", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25LQ032, .total_size = 4096, @@ -1181,7 +1181,7 @@ { .vendor = "AMIC", .name = "A29002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29002B, .total_size = 256, @@ -1213,7 +1213,7 @@ { .vendor = "AMIC", .name = "A29002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29002T, .total_size = 256, @@ -1245,7 +1245,7 @@ { .vendor = "AMIC", .name = "A29040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29040B, .total_size = 512, @@ -1272,7 +1272,7 @@ { .vendor = "AMIC", .name = "A49LF040A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A49LF040A, .total_size = 512, @@ -1300,7 +1300,7 @@ { .vendor = "Atmel", .name = "AT25DF021", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF021, .total_size = 256, @@ -1338,7 +1338,7 @@ { .vendor = "Atmel", .name = "AT25DF041A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF041A, .total_size = 512, @@ -1376,7 +1376,7 @@ { .vendor = "Atmel", .name = "AT25DF081", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF081, .total_size = 1024, @@ -1414,7 +1414,7 @@ { .vendor = "Atmel", .name = "AT25DF081A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF081A, .total_size = 1024, @@ -1451,7 +1451,7 @@ { .vendor = "Atmel", .name = "AT25DF161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF161, .total_size = 2048, @@ -1489,7 +1489,7 @@ { .vendor = "Atmel", .name = "AT25DF321", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF321, .total_size = 4096, @@ -1527,7 +1527,7 @@ { .vendor = "Atmel", .name = "AT25DF321A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF321A, .total_size = 4096, @@ -1565,7 +1565,7 @@ { .vendor = "Atmel", .name = "AT25DF641", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF641, .total_size = 8192, @@ -1603,7 +1603,7 @@ { .vendor = "Atmel", .name = "AT25DQ161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DQ161, .total_size = 2048, @@ -1641,7 +1641,7 @@ { .vendor = "Atmel", .name = "AT25F512B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25F512B, .total_size = 64, @@ -1679,7 +1679,7 @@ { .vendor = "Atmel", .name = "AT25FS010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25FS010, .total_size = 128, @@ -1719,7 +1719,7 @@ { .vendor = "Atmel", .name = "AT25FS040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25FS040, .total_size = 512, @@ -1756,7 +1756,7 @@ { .vendor = "Atmel", .name = "AT26DF041", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF041, .total_size = 512, @@ -1779,7 +1779,7 @@ { .vendor = "Atmel", .name = "AT26DF081A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF081A, .total_size = 1024, @@ -1817,7 +1817,7 @@ { .vendor = "Atmel", .name = "AT26DF161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF161, .total_size = 2048, @@ -1854,7 +1854,7 @@ { .vendor = "Atmel", .name = "AT26DF161A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF161A, .total_size = 2048, @@ -1892,7 +1892,7 @@ /*{ .vendor = "Atmel", .name = "AT26DF321", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF321, .total_size = 4096, @@ -1909,7 +1909,7 @@ { .vendor = "Atmel", .name = "AT26F004", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26F004, .total_size = 512, @@ -1944,7 +1944,7 @@ { .vendor = "Atmel", .name = "AT29C512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C512, .total_size = 64, @@ -1968,7 +1968,7 @@ { .vendor = "Atmel", .name = "AT29C010A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C010A, .total_size = 128, @@ -1992,7 +1992,7 @@ { .vendor = "Atmel", .name = "AT29C020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C020, .total_size = 256, @@ -2016,7 +2016,7 @@ { .vendor = "Atmel", .name = "AT29C040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C040A, .total_size = 512, @@ -2040,7 +2040,7 @@ { .vendor = "Atmel", .name = "AT45CS1282", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45CS1282, .total_size = 16896 /* No power of two sizes */, @@ -2056,7 +2056,7 @@ { .vendor = "Atmel", .name = "AT45DB011D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB011D, .total_size = 128 /* Size can only be determined from status register */, @@ -2072,7 +2072,7 @@ { .vendor = "Atmel", .name = "AT45DB021D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB021D, .total_size = 256 /* Size can only be determined from status register */, @@ -2088,7 +2088,7 @@ { .vendor = "Atmel", .name = "AT45DB041D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB041D, .total_size = 512 /* Size can only be determined from status register */, @@ -2104,7 +2104,7 @@ { .vendor = "Atmel", .name = "AT45DB081D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB081D, .total_size = 1024 /* Size can only be determined from status register */, @@ -2120,7 +2120,7 @@ { .vendor = "Atmel", .name = "AT45DB161D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB161D, .total_size = 2048 /* Size can only be determined from status register */, @@ -2136,7 +2136,7 @@ { .vendor = "Atmel", .name = "AT45DB321C", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB321C, .total_size = 4224 /* No power of two sizes */, @@ -2152,7 +2152,7 @@ { .vendor = "Atmel", .name = "AT45DB321D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB321D, .total_size = 4096 /* Size can only be determined from status register */, @@ -2168,7 +2168,7 @@ { .vendor = "Atmel", .name = "AT45DB642D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB642D, .total_size = 8192 /* Size can only be determined from status register */, @@ -2184,7 +2184,7 @@ { .vendor = "Atmel", .name = "AT49BV512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49BV512, .total_size = 64, @@ -2208,7 +2208,7 @@ { .vendor = "Atmel", .name = "AT49F020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F020, .total_size = 256, @@ -2232,7 +2232,7 @@ { .vendor = "Atmel", .name = "AT49F002(N)", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F002N, .total_size = 256, @@ -2264,7 +2264,7 @@ { .vendor = "Atmel", .name = "AT49F002(N)T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F002NT, .total_size = 256, @@ -2296,7 +2296,7 @@ { .vendor = "Bright", .name = "BM29F040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = BRIGHT_ID, .model_id = BRIGHT_BM29F040, .total_size = 512, @@ -2322,7 +2322,7 @@ { .vendor = "EMST", .name = "F49B002UA", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EMST_ID, .model_id = EMST_F49B002UA, .total_size = 256, @@ -2354,7 +2354,7 @@ { .vendor = "EMST", .name = "F25L008A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EMST_ID, .model_id = EMST_F25L008A, .total_size = 1024, @@ -2387,7 +2387,7 @@ { .vendor = "Eon", .name = "EN25B05", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B05, .total_size = 64, @@ -2419,7 +2419,7 @@ { .vendor = "Eon", .name = "EN25B05T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B05, .total_size = 64, @@ -2451,7 +2451,7 @@ { .vendor = "Eon", .name = "EN25B10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B10, .total_size = 128, @@ -2483,7 +2483,7 @@ { .vendor = "Eon", .name = "EN25B10T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B10, .total_size = 128, @@ -2515,7 +2515,7 @@ { .vendor = "Eon", .name = "EN25B20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B20, .total_size = 256, @@ -2548,7 +2548,7 @@ { .vendor = "Eon", .name = "EN25B20T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B20, .total_size = 256, @@ -2581,7 +2581,7 @@ { .vendor = "Eon", .name = "EN25B40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B40, .total_size = 512, @@ -2614,7 +2614,7 @@ { .vendor = "Eon", .name = "EN25B40T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B40, .total_size = 512, @@ -2647,7 +2647,7 @@ { .vendor = "Eon", .name = "EN25B80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B80, .total_size = 1024, @@ -2680,7 +2680,7 @@ { .vendor = "Eon", .name = "EN25B80T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B80, .total_size = 1024, @@ -2713,7 +2713,7 @@ { .vendor = "Eon", .name = "EN25B16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B16, .total_size = 2048, @@ -2746,7 +2746,7 @@ { .vendor = "Eon", .name = "EN25B16T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B16, .total_size = 2048, @@ -2779,7 +2779,7 @@ { .vendor = "Eon", .name = "EN25B32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B32, .total_size = 4096, @@ -2812,7 +2812,7 @@ { .vendor = "Eon", .name = "EN25B32T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B32, .total_size = 4096, @@ -2845,7 +2845,7 @@ { .vendor = "Eon", .name = "EN25B64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B64, .total_size = 8192, @@ -2879,7 +2879,7 @@ { .vendor = "Eon", .name = "EN25B64T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B64, .total_size = 8192, @@ -2912,7 +2912,7 @@ { .vendor = "Eon", .name = "EN25D16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25D16, .total_size = 2048, @@ -2948,7 +2948,7 @@ { .vendor = "Eon", .name = "EN25F05", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F05, .total_size = 64, @@ -2985,7 +2985,7 @@ { .vendor = "Eon", .name = "EN25F10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F10, .total_size = 128, @@ -3022,7 +3022,7 @@ { .vendor = "Eon", .name = "EN25F20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F20, .total_size = 256, @@ -3059,7 +3059,7 @@ { .vendor = "Eon", .name = "EN25F40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F40, .total_size = 512, @@ -3093,7 +3093,7 @@ { .vendor = "Eon", .name = "EN25F80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F80, .total_size = 1024, @@ -3127,7 +3127,7 @@ { .vendor = "Eon", .name = "EN25F16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F16, .total_size = 2048, @@ -3161,7 +3161,7 @@ { .vendor = "Eon", .name = "EN25F32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F32, .total_size = 4096, @@ -3195,7 +3195,7 @@ { .vendor = "Eon", .name = "EN29F010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EON_ID, .model_id = EON_EN29F010, .total_size = 128, @@ -3223,7 +3223,7 @@ { .vendor = "Eon", .name = "EN29F002(A)(N)B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EON_ID, .model_id = EON_EN29F002B, .total_size = 256, @@ -3255,7 +3255,7 @@ { .vendor = "Eon", .name = "EN29F002(A)(N)T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EON_ID, .model_id = EON_EN29F002T, .total_size = 256, @@ -3287,7 +3287,7 @@ { .vendor = "Fujitsu", .name = "MBM29F004BC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F004BC, .total_size = 512, @@ -3319,7 +3319,7 @@ { .vendor = "Fujitsu", .name = "MBM29F004TC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F004TC, .total_size = 512, @@ -3352,7 +3352,7 @@ /* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */ .vendor = "Fujitsu", .name = "MBM29F400BC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F400BC, .total_size = 512, @@ -3384,7 +3384,7 @@ { .vendor = "Fujitsu", .name = "MBM29F400TC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F400TC, .total_size = 512, @@ -3416,7 +3416,7 @@ { .vendor = "Hyundai", .name = "HY29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F002T, .total_size = 256, @@ -3448,7 +3448,7 @@ { .vendor = "Hyundai", .name = "HY29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F002B, .total_size = 256, @@ -3480,7 +3480,7 @@ { .vendor = "Hyundai", .name = "HY29F040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F040A, .total_size = 512, @@ -3506,7 +3506,7 @@ { .vendor = "Intel", .name = "28F001BN/BX-B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F001B, .total_size = 128, @@ -3533,7 +3533,7 @@ { .vendor = "Intel", .name = "28F001BN/BX-T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F001T, .total_size = 128, @@ -3560,7 +3560,7 @@ { .vendor = "Intel", .name = "28F002BC/BL/BV/BX-T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F002T, .total_size = 256, @@ -3588,7 +3588,7 @@ { .vendor = "Intel", .name = "28F008S3/S5/SC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F004S3, .total_size = 512, @@ -3611,7 +3611,7 @@ { .vendor = "Intel", .name = "28F004B5/BE/BV/BX-B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F004B, .total_size = 512, @@ -3638,7 +3638,7 @@ { .vendor = "Intel", .name = "28F004B5/BE/BV/BX-T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F004T, .total_size = 512, @@ -3665,7 +3665,7 @@ { .vendor = "Intel", .name = "28F400BV/BX/CE/CV-B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F400B, .total_size = 512, @@ -3693,7 +3693,7 @@ { .vendor = "Intel", .name = "28F400BV/BX/CE/CV-T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = INTEL_ID, .model_id = INTEL_28F400T, .total_size = 512, @@ -3721,7 +3721,7 @@ { .vendor = "Intel", .name = "82802AB", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = INTEL_ID, .model_id = INTEL_82802AB, .total_size = 512, @@ -3746,7 +3746,7 @@ { .vendor = "Intel", .name = "82802AC", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = INTEL_ID, .model_id = INTEL_82802AC, .total_size = 1024, @@ -3771,7 +3771,7 @@ { .vendor = "Macronix", .name = "MX25L512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L512, .total_size = 64, @@ -3808,7 +3808,7 @@ { .vendor = "Macronix", .name = "MX25L1005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1005, .total_size = 128, @@ -3842,7 +3842,7 @@ { .vendor = "Macronix", .name = "MX25L2005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L2005, .total_size = 256, @@ -3879,7 +3879,7 @@ { .vendor = "Macronix", .name = "MX25L4005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L4005, .total_size = 512, @@ -3916,7 +3916,7 @@ { .vendor = "Macronix", .name = "MX25L8005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L8005, .total_size = 1024, @@ -3953,7 +3953,7 @@ { .vendor = "Macronix", .name = "MX25L1605", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1605, .total_size = 2048, @@ -3990,7 +3990,7 @@ { .vendor = "Macronix", .name = "MX25L1635D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1635D, .total_size = 2048, @@ -4024,7 +4024,7 @@ { .vendor = "Macronix", .name = "MX25L1635E", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1635E, .total_size = 2048, @@ -4057,7 +4057,7 @@ { .vendor = "Macronix", .name = "MX25L3205", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L3205, .total_size = 4096, @@ -4091,7 +4091,7 @@ { .vendor = "Macronix", .name = "MX25L3235D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L3235D, .total_size = 4096, @@ -4125,7 +4125,7 @@ { .vendor = "Macronix", .name = "MX25L6405", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L6405, .total_size = 8192, @@ -4159,7 +4159,7 @@ { .vendor = "Macronix", .name = "MX25L12805", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L12805, .total_size = 16384, @@ -4193,7 +4193,7 @@ { .vendor = "Macronix", .name = "MX29F001B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F001B, .total_size = 128, @@ -4226,7 +4226,7 @@ { .vendor = "Macronix", .name = "MX29F001T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F001T, .total_size = 128, @@ -4259,7 +4259,7 @@ { .vendor = "Macronix", .name = "MX29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F002B, .total_size = 256, @@ -4291,7 +4291,7 @@ { .vendor = "Macronix", .name = "MX29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F002T, .total_size = 256, @@ -4323,7 +4323,7 @@ { .vendor = "Macronix", .name = "MX29F040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F040, .total_size = 512, @@ -4349,7 +4349,7 @@ { .vendor = "Macronix", .name = "MX29LV040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29LV040, .total_size = 512, @@ -4376,7 +4376,7 @@ { .vendor = "MoselVitelic", .name = "V29C51000B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51000B, .total_size = 64, @@ -4403,7 +4403,7 @@ { .vendor = "MoselVitelic", .name = "V29C51000T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51000T, .total_size = 64, @@ -4430,7 +4430,7 @@ { .vendor = "MoselVitelic", .name = "V29C51400B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51400B, .total_size = 512, @@ -4457,7 +4457,7 @@ { .vendor = "MoselVitelic", .name = "V29C51400T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51400T, .total_size = 512, @@ -4484,7 +4484,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51000", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51000, .total_size = 64, @@ -4511,7 +4511,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51001", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51001, .total_size = 128, @@ -4538,7 +4538,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51002", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51002, .total_size = 256, @@ -4565,7 +4565,7 @@ { .vendor = "Numonyx", .name = "M25PE10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE10, .total_size = 128, @@ -4595,7 +4595,7 @@ { .vendor = "Numonyx", .name = "M25PE20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE20, .total_size = 256, @@ -4625,7 +4625,7 @@ { .vendor = "Numonyx", .name = "M25PE40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE40, .total_size = 512, @@ -4655,7 +4655,7 @@ { .vendor = "Numonyx", .name = "M25PE80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE80, .total_size = 1024, @@ -4685,7 +4685,7 @@ { .vendor = "Numonyx", .name = "M25PE16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE16, .total_size = 2048, @@ -4715,7 +4715,7 @@ { .vendor = "PMC", .name = "Pm25LV010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV010, .total_size = 128, @@ -4745,7 +4745,7 @@ { .vendor = "PMC", .name = "Pm25LV016B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV016B, .total_size = 2048, @@ -4780,7 +4780,7 @@ { .vendor = "PMC", .name = "Pm25LV020", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV020, .total_size = 256, @@ -4810,7 +4810,7 @@ { .vendor = "PMC", .name = "Pm25LV040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV040, .total_size = 512, @@ -4840,7 +4840,7 @@ { .vendor = "PMC", .name = "Pm25LV080B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV080B, .total_size = 1024, @@ -4876,7 +4876,7 @@ { .vendor = "PMC", .name = "Pm25LV512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV512, .total_size = 64, @@ -4905,7 +4905,7 @@ { .vendor = "PMC", .name = "Pm29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM29F002T, .total_size = 256, @@ -4937,7 +4937,7 @@ { .vendor = "PMC", .name = "Pm29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM29F002B, .total_size = 256, @@ -4969,7 +4969,7 @@ { .vendor = "PMC", .name = "Pm39LV010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM39F010, /* Pm39LV010 and Pm39F010 have identical IDs but different voltage */ .total_size = 128, @@ -4999,7 +4999,7 @@ { .vendor = "PMC", .name = "Pm39LV020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM39LV020, .total_size = 256, @@ -5029,7 +5029,7 @@ { .vendor = "PMC", .name = "Pm39LV040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM39LV040, .total_size = 512, @@ -5059,7 +5059,7 @@ { .vendor = "PMC", .name = "Pm49FL002", - .bustype = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_LPC | BUS_FWH, /* A/A Mux */ .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM49FL002, .total_size = 256, @@ -5090,7 +5090,7 @@ { .vendor = "PMC", .name = "Pm49FL004", - .bustype = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_LPC | BUS_FWH, /* A/A Mux */ .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM49FL004, .total_size = 512, @@ -5121,7 +5121,7 @@ { .vendor = "Sanyo", .name = "LF25FW203A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SANYO_ID, .model_id = SANYO_LE25FW203A, .total_size = 2048, @@ -5147,7 +5147,7 @@ { .vendor = "Sharp", .name = "LHF00L04", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = SHARP_ID, .model_id = SHARP_LHF00L04, .total_size = 1024, @@ -5180,7 +5180,7 @@ { .vendor = "Spansion", .name = "S25FL004A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL004A, .total_size = 512, @@ -5206,7 +5206,7 @@ { .vendor = "Spansion", .name = "S25FL008A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL008A, .total_size = 1024, @@ -5233,7 +5233,7 @@ { .vendor = "Spansion", .name = "S25FL016A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL016A, .total_size = 2048, @@ -5260,7 +5260,7 @@ { .vendor = "Spansion", .name = "S25FL032A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL032A, .total_size = 4096, @@ -5286,7 +5286,7 @@ { .vendor = "Spansion", .name = "S25FL064A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL064A, .total_size = 8192, @@ -5312,7 +5312,7 @@ { .vendor = "SST", .name = "SST25VF010.REMS", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF010_REMS, .total_size = 128, @@ -5341,7 +5341,7 @@ { .vendor = "SST", .name = "SST25VF016B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF016B, .total_size = 2048, @@ -5377,7 +5377,7 @@ { .vendor = "SST", .name = "SST25VF032B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF032B, .total_size = 4096, @@ -5413,7 +5413,7 @@ { .vendor = "SST", .name = "SST25VF064C", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF064C, .total_size = 8192, @@ -5449,7 +5449,7 @@ { .vendor = "SST", .name = "SST25VF040.REMS", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF040_REMS, .total_size = 512, @@ -5478,7 +5478,7 @@ { .vendor = "SST", .name = "SST25VF040B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF040B, .total_size = 512, @@ -5514,7 +5514,7 @@ { .vendor = "SST", .name = "SST25LF040A.RES", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF040_REMS, .total_size = 512, @@ -5543,7 +5543,7 @@ { .vendor = "SST", .name = "SST25VF040B.REMS", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF040B_REMS, .total_size = 512, @@ -5578,7 +5578,7 @@ { .vendor = "SST", .name = "SST25VF080B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF080B, .total_size = 1024, @@ -5614,7 +5614,7 @@ { .vendor = "SST", .name = "SST28SF040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST28SF040, .total_size = 512, @@ -5642,7 +5642,7 @@ { .vendor = "SST", .name = "SST29EE010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29EE010, .total_size = 128, @@ -5666,7 +5666,7 @@ { .vendor = "SST", .name = "SST29LE010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29LE010, .total_size = 128, @@ -5690,7 +5690,7 @@ { .vendor = "SST", .name = "SST29EE020A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29EE020A, .total_size = 256, @@ -5714,7 +5714,7 @@ { .vendor = "SST", .name = "SST29LE020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29LE020, .total_size = 256, @@ -5738,7 +5738,7 @@ { .vendor = "SST", .name = "SST39SF512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF512, .total_size = 64, @@ -5765,7 +5765,7 @@ { .vendor = "SST", .name = "SST39SF010A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF010, .total_size = 128, @@ -5792,7 +5792,7 @@ { .vendor = "SST", .name = "SST39SF020A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF020, .total_size = 256, @@ -5819,7 +5819,7 @@ { .vendor = "SST", .name = "SST39SF040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF040, .total_size = 512, @@ -5846,7 +5846,7 @@ { .vendor = "SST", .name = "SST39VF512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF512, .total_size = 64, @@ -5873,7 +5873,7 @@ { .vendor = "SST", .name = "SST39VF010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF010, .total_size = 128, @@ -5900,7 +5900,7 @@ { .vendor = "SST", .name = "SST39VF020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF020, .total_size = 256, @@ -5927,7 +5927,7 @@ { .vendor = "SST", .name = "SST39VF040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF040, .total_size = 512, @@ -5954,7 +5954,7 @@ { .vendor = "SST", .name = "SST39VF080", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF080, .total_size = 1024, @@ -5984,7 +5984,7 @@ { .vendor = "SST", .name = "SST49LF002A/B", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF002A, .total_size = 256, @@ -6016,7 +6016,7 @@ { .vendor = "SST", .name = "SST49LF003A/B", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF003A, .total_size = 384, @@ -6051,7 +6051,7 @@ */ .vendor = "SST", .name = "SST49LF004A/B", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF004A, .total_size = 512, @@ -6083,7 +6083,7 @@ { .vendor = "SST", .name = "SST49LF004C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF004C, .total_size = 512, @@ -6116,7 +6116,7 @@ { .vendor = "SST", .name = "SST49LF008A", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF008A, .total_size = 1024, @@ -6148,7 +6148,7 @@ { .vendor = "SST", .name = "SST49LF008C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF008C, .total_size = 1024, @@ -6181,7 +6181,7 @@ { .vendor = "SST", .name = "SST49LF016C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF016C, .total_size = 2048, @@ -6214,7 +6214,7 @@ { .vendor = "SST", .name = "SST49LF020", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF020, .total_size = 256, @@ -6244,7 +6244,7 @@ { .vendor = "SST", .name = "SST49LF020A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF020A, .total_size = 256, @@ -6274,7 +6274,7 @@ { .vendor = "SST", .name = "SST49LF040", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF040, .total_size = 512, @@ -6304,7 +6304,7 @@ { .vendor = "SST", .name = "SST49LF040B", - .bustype = CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_LPC, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF040B, .total_size = 512, @@ -6335,7 +6335,7 @@ { .vendor = "SST", .name = "SST49LF080A", - .bustype = CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_LPC, /* A/A Mux */ .manufacture_id = SST_ID, .model_id = SST_SST49LF080A, .total_size = 1024, @@ -6365,7 +6365,7 @@ { .vendor = "SST", .name = "SST49LF160C", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF160C, .total_size = 2048, @@ -6398,7 +6398,7 @@ { .vendor = "ST", .name = "M25P05-A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P05A, .total_size = 64, @@ -6430,7 +6430,7 @@ { .vendor = "ST", .name = "M25P05.RES", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = 0, /* Not used. */ .model_id = ST_M25P05_RES, .total_size = 64, @@ -6457,7 +6457,7 @@ { .vendor = "ST", .name = "M25P10-A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P10A, .total_size = 128, @@ -6485,7 +6485,7 @@ { .vendor = "ST", .name = "M25P10.RES", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = 0, /* Not used. */ .model_id = ST_M25P10_RES, .total_size = 128, @@ -6512,7 +6512,7 @@ { .vendor = "ST", .name = "M25P20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P20, .total_size = 256, @@ -6539,7 +6539,7 @@ { .vendor = "ST", .name = "M25P40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P40, .total_size = 512, @@ -6566,7 +6566,7 @@ { .vendor = "ST", .name = "M25P40-old", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = 0, /* Not used. */ .model_id = ST_M25P40_RES, .total_size = 512, @@ -6592,7 +6592,7 @@ { .vendor = "ST", .name = "M25P80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P80, .total_size = 1024, @@ -6619,7 +6619,7 @@ { .vendor = "ST", .name = "M25P16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P16, .total_size = 2048, @@ -6646,7 +6646,7 @@ { .vendor = "ST", .name = "M25P32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P32, .total_size = 4096, @@ -6673,7 +6673,7 @@ { .vendor = "ST", .name = "M25P64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P64, .total_size = 8192, @@ -6700,7 +6700,7 @@ { .vendor = "ST", .name = "M25P128", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P128, .total_size = 16384, @@ -6727,7 +6727,7 @@ { .vendor = "ST", .name = "M25PX16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX16, .total_size = 2048, @@ -6756,7 +6756,7 @@ { .vendor = "ST", .name = "M25PX32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX32, .total_size = 4096, @@ -6785,7 +6785,7 @@ { .vendor = "ST", .name = "M25PX64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX64, .total_size = 8192, @@ -6814,7 +6814,7 @@ { .vendor = "ST", .name = "M29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F002B, .total_size = 256, @@ -6846,7 +6846,7 @@ { .vendor = "ST", .name = "M29F002T/NT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F002T, .total_size = 256, @@ -6878,7 +6878,7 @@ { .vendor = "ST", .name = "M29F040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F040B, .total_size = 512, @@ -6906,7 +6906,7 @@ /* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */ .vendor = "ST", .name = "M29F400BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F400BB, .total_size = 512, @@ -6938,7 +6938,7 @@ /* FIXME: this has WORD/BYTE sequences; 2AA for word, 555 for byte */ .vendor = "ST", .name = "M29F400BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F400BT, .total_size = 512, @@ -6970,7 +6970,7 @@ { .vendor = "ST", .name = "M29W010B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W010B, .total_size = 128, @@ -6997,7 +6997,7 @@ { .vendor = "ST", .name = "M29W040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W040B, .total_size = 512, @@ -7024,7 +7024,7 @@ { .vendor = "ST", .name = "M29W512B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W512B, .total_size = 64, @@ -7048,7 +7048,7 @@ { .vendor = "ST", .name = "M50FLW040A", - .bustype = CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_FWH | BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FLW040A, .total_size = 512, @@ -7081,7 +7081,7 @@ { .vendor = "ST", .name = "M50FLW040B", - .bustype = CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_FWH | BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FLW040B, .total_size = 512, @@ -7114,7 +7114,7 @@ { .vendor = "ST", .name = "M50FLW080A", - .bustype = CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_FWH | BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FLW080A, .total_size = 1024, @@ -7147,7 +7147,7 @@ { .vendor = "ST", .name = "M50FLW080B", - .bustype = CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_FWH | BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FLW080B, .total_size = 1024, @@ -7180,7 +7180,7 @@ { .vendor = "ST", .name = "M50FW002", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FW002, .total_size = 256, @@ -7210,7 +7210,7 @@ { .vendor = "ST", .name = "M50FW016", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FW016, .total_size = 2048, @@ -7235,7 +7235,7 @@ { .vendor = "ST", .name = "M50FW040", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FW040, .total_size = 512, @@ -7260,7 +7260,7 @@ { .vendor = "ST", .name = "M50FW080", - .bustype = CHIP_BUSTYPE_FWH, /* A/A Mux */ + .bustype = BUS_FWH, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50FW080, .total_size = 1024, @@ -7285,7 +7285,7 @@ { .vendor = "ST", .name = "M50LPW116", - .bustype = CHIP_BUSTYPE_LPC, /* A/A Mux */ + .bustype = BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, .model_id = ST_M50LPW116, .total_size = 2048, @@ -7316,7 +7316,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51001B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51001B, .total_size = 128, @@ -7343,7 +7343,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51001T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51001T, .total_size = 128, @@ -7370,7 +7370,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51002B, .total_size = 256, @@ -7396,7 +7396,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51002T, .total_size = 256, @@ -7422,7 +7422,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51004B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51004B, .total_size = 512, @@ -7449,7 +7449,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{F,S,V}29C51004T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C51004T, .total_size = 512, @@ -7476,7 +7476,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{S,V}29C31004B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C31004B, .total_size = 512, @@ -7503,7 +7503,7 @@ { .vendor = "SyncMOS/MoselVitelic", .name = "{S,V}29C31004T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = SM_MVC_29C31004T, .total_size = 512, @@ -7530,7 +7530,7 @@ { .vendor = "TI", .name = "TMS29F002RB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = TI_OLD_ID, .model_id = TI_TMS29F002RB, .total_size = 256, @@ -7562,7 +7562,7 @@ { .vendor = "TI", .name = "TMS29F002RT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = TI_OLD_ID, .model_id = TI_TMS29F002RT, .total_size = 256, @@ -7594,7 +7594,7 @@ { .vendor = "Winbond", .name = "W25Q80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25Q80, .total_size = 1024, @@ -7631,7 +7631,7 @@ { .vendor = "Winbond", .name = "W25Q16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25Q16, .total_size = 2048, @@ -7668,7 +7668,7 @@ { .vendor = "Winbond", .name = "W25Q32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25Q32, .total_size = 4096, @@ -7705,7 +7705,7 @@ { .vendor = "Winbond", .name = "W25Q64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25Q64, .total_size = 8192, @@ -7741,7 +7741,7 @@ { .vendor = "Winbond", .name = "W25Q128", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25Q128, .total_size = 16384, @@ -7777,7 +7777,7 @@ { .vendor = "Winbond", .name = "W25x10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X10, .total_size = 128, @@ -7808,7 +7808,7 @@ { .vendor = "Winbond", .name = "W25x20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X20, .total_size = 256, @@ -7839,7 +7839,7 @@ { .vendor = "Winbond", .name = "W25x40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X40, .total_size = 512, @@ -7870,7 +7870,7 @@ { .vendor = "Winbond", .name = "W25x80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X80, .total_size = 1024, @@ -7901,7 +7901,7 @@ { .vendor = "Winbond", .name = "W25x16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X16, .total_size = 2048, @@ -7938,7 +7938,7 @@ { .vendor = "Winbond", .name = "W25x32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X32, .total_size = 4096, @@ -7975,7 +7975,7 @@ { .vendor = "Winbond", .name = "W25x64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = WINBOND_NEX_ID, .model_id = WINBOND_NEX_W25X64, .total_size = 8192, @@ -8012,7 +8012,7 @@ { .vendor = "Winbond", .name = "W29C010(M)/W29C011A/W29EE011/W29EE012", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C010, .total_size = 128, @@ -8035,7 +8035,7 @@ { .vendor = "Winbond", .name = "W29C020(C)/W29C022", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C020, .total_size = 256, @@ -8059,7 +8059,7 @@ { .vendor = "Winbond", .name = "W29C040/P", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C040, .total_size = 512, @@ -8083,7 +8083,7 @@ { .vendor = "Winbond", .name = "W29C010(M)/W29C011A/W29EE011/W29EE012", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C010, .total_size = 128, @@ -8106,7 +8106,7 @@ { .vendor = "Winbond", .name = "W39L040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39L040, .total_size = 512, @@ -8136,7 +8136,7 @@ { .vendor = "Winbond", .name = "W39V040A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040A, .total_size = 512, @@ -8164,7 +8164,7 @@ { .vendor = "Winbond", .name = "W39V040B", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, .total_size = 512, @@ -8192,7 +8192,7 @@ { .vendor = "Winbond", .name = "W39V040C", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, .total_size = 512, @@ -8220,7 +8220,7 @@ { .vendor = "Winbond", .name = "W39V040FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040FA, .total_size = 512, @@ -8252,7 +8252,7 @@ { .vendor = "Winbond", .name = "W39V040FB", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, .total_size = 512, @@ -8280,7 +8280,7 @@ { .vendor = "Winbond", .name = "W39V040FC", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, .total_size = 512, @@ -8307,7 +8307,7 @@ { .vendor = "Winbond", .name = "W39V080A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V080A, .total_size = 1024, @@ -8335,7 +8335,7 @@ { .vendor = "Winbond", .name = "W49F002U/N", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49F002U, .total_size = 256, @@ -8367,7 +8367,7 @@ { .vendor = "Winbond", .name = "W49F020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49F020, .total_size = 256, @@ -8391,7 +8391,7 @@ { .vendor = "Winbond", .name = "W49V002A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49V002A, .total_size = 256, @@ -8423,7 +8423,7 @@ { .vendor = "Winbond", .name = "W49V002FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49V002FA, .total_size = 256, @@ -8455,7 +8455,7 @@ { .vendor = "Winbond", .name = "W39V080FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V080FA, .total_size = 1024, @@ -8484,7 +8484,7 @@ { .vendor = "Winbond", .name = "W39V080FA (dual mode)", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V080FA_DM, .total_size = 512, @@ -8511,7 +8511,7 @@ { .vendor = "AMIC", .name = "unknown AMIC SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8526,7 +8526,7 @@ { .vendor = "Atmel", .name = "unknown Atmel SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8541,7 +8541,7 @@ { .vendor = "Eon", .name = "unknown Eon SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8556,7 +8556,7 @@ { .vendor = "Macronix", .name = "unknown Macronix SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8571,7 +8571,7 @@ { .vendor = "PMC", .name = "unknown PMC SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8586,7 +8586,7 @@ { .vendor = "SST", .name = "unknown SST SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8601,7 +8601,7 @@ { .vendor = "ST", .name = "unknown ST SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8616,7 +8616,7 @@ { .vendor = "Sanyo", .name = "unknown Sanyo SPI chip", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SANYO_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8631,7 +8631,7 @@ { .vendor = "Generic", .name = "unknown SPI chip (RDID)", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = GENERIC_MANUF_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, @@ -8643,7 +8643,7 @@ { .vendor = "Generic", .name = "unknown SPI chip (REMS)", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = GENERIC_MANUF_ID, .model_id = GENERIC_DEVICE_ID, .total_size = 0, Index: flashrom-chip_bustype_foo_rename/spi.c =================================================================== --- flashrom-chip_bustype_foo_rename/spi.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/spi.c (Arbeitskopie) @@ -195,5 +195,5 @@ void register_spi_programmer(const struct spi_programmer *pgm) { spi_programmer = pgm; - buses_supported |= CHIP_BUSTYPE_SPI; + buses_supported |= BUS_SPI; } \ No newline at end of file Index: flashrom-chip_bustype_foo_rename/nic3com.c =================================================================== --- flashrom-chip_bustype_foo_rename/nic3com.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/nic3com.c (Arbeitskopie) @@ -81,7 +81,7 @@ */ OUTW(SELECT_REG_WINDOW + 0, io_base_addr + INT_STATUS); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; max_rom_decode.parallel = 128 * 1024; return 0; Index: flashrom-chip_bustype_foo_rename/satasii.c =================================================================== --- flashrom-chip_bustype_foo_rename/satasii.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/satasii.c (Arbeitskopie) @@ -65,7 +65,7 @@ if ((id != 0x0680) && (!(pci_mmio_readl(sii_bar) & (1 << 26)))) msg_pinfo("Warning: Flash seems unconnected.\n"); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; return 0; } Index: flashrom-chip_bustype_foo_rename/nicintel.c =================================================================== --- flashrom-chip_bustype_foo_rename/nicintel.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/nicintel.c (Arbeitskopie) @@ -78,7 +78,7 @@ */ pci_rmmio_writew(0x0001, nicintel_control_bar + CSR_FCR); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE; Index: flashrom-chip_bustype_foo_rename/chipset_enable.c =================================================================== --- flashrom-chip_bustype_foo_rename/chipset_enable.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/chipset_enable.c (Arbeitskopie) @@ -208,7 +208,7 @@ uint16_t old, new; uint16_t xbcs = 0x4e; /* X-Bus Chip Select register. */ - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; old = pci_read_word(dev, xbcs); @@ -286,7 +286,7 @@ * FWH_DEC_EN1, but they are called FB_SEL1, FB_SEL2, FB_DEC_EN1 and * FB_DEC_EN2. */ - buses_supported = CHIP_BUSTYPE_FWH; + buses_supported = BUS_FWH; return enable_flash_ich(dev, name, 0x4e); } @@ -385,7 +385,7 @@ /* If we're called by enable_flash_ich_dc_spi, it will override * buses_supported anyway. */ - buses_supported = CHIP_BUSTYPE_FWH; + buses_supported = BUS_FWH; return enable_flash_ich(dev, name, 0xdc); } @@ -405,7 +405,7 @@ if (new != old) rpci_write_byte(dev, 0xd9, new); - buses_supported = CHIP_BUSTYPE_FWH; + buses_supported = BUS_FWH; return 0; } @@ -458,7 +458,7 @@ * on ICH7 when the southbridge is strapped to LPC */ - buses_supported = CHIP_BUSTYPE_FWH; + buses_supported = BUS_FWH; if (ich_generation == 7) { if(bbs == ICH_STRAP_LPC) { /* No further SPI initialization required */ @@ -469,7 +469,7 @@ buses_supported = 0; } - /* this adds CHIP_BUSTYPE_SPI */ + /* this adds BUS_SPI */ if (ich_init_spi(dev, tmp, rcrb, ich_generation) != 0) { if (!ret) ret = ERROR_NONFATAL; @@ -557,7 +557,7 @@ #define CS5530_ENABLE_SA2320 (1 << 2) #define CS5530_ENABLE_SA20 (1 << 6) - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* Decode 0x000E0000-0x000FFFFF (128 kB), not just 64 kB, and * decode 0xFF000000-0xFFFFFFFF (16 MB), not just 256 kB. * FIXME: Should we really touch the low mapping below 1 MB? Flashrom @@ -707,7 +707,7 @@ (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff)); } - buses_supported = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH; + buses_supported = BUS_LPC | BUS_FWH; ret = sb600_probe_spi(dev); @@ -793,7 +793,7 @@ { uint8_t tmp; - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; tmp = INB(0xc06); tmp |= 0x1; @@ -893,7 +893,7 @@ switch ((val >> 5) & 0x3) { case 0x0: ret = enable_flash_mcp55(dev, name); - buses_supported = CHIP_BUSTYPE_LPC; + buses_supported = BUS_LPC; msg_pdbg("Flash bus type is LPC\n"); break; case 0x2: @@ -901,14 +901,14 @@ /* SPI is added in mcp6x_spi_init if it works. * Do we really want to disable LPC in this case? */ - buses_supported = CHIP_BUSTYPE_NONE; + buses_supported = BUS_NONE; msg_pdbg("Flash bus type is SPI\n"); msg_perr("SPI on this chipset is WIP. Write is unsupported!\n"); programmer_may_write = 0; break; default: /* Should not happen. */ - buses_supported = CHIP_BUSTYPE_NONE; + buses_supported = BUS_NONE; msg_pdbg("Flash bus type is unknown (none)\n"); msg_pinfo("Something went wrong with bus type detection.\n"); goto out_msg; Index: flashrom-chip_bustype_foo_rename/flashrom.c =================================================================== --- flashrom-chip_bustype_foo_rename/flashrom.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/flashrom.c (Arbeitskopie) @@ -521,7 +521,7 @@ .fwh = 0xffffffff, .spi = 0xffffffff }; - buses_supported = CHIP_BUSTYPE_NONE; + buses_supported = BUS_NONE; /* Default to top aligned flash at 4 GB. */ flashbase = 0; /* Registering shutdown functions is now allowed. */ @@ -1082,7 +1082,7 @@ int check_max_decode(enum chipbustype buses, uint32_t size) { int limitexceeded = 0; - if ((buses & CHIP_BUSTYPE_PARALLEL) && + if ((buses & BUS_PARALLEL) && (max_rom_decode.parallel < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " @@ -1091,7 +1091,7 @@ "probe/read/erase/write may fail. ", size / 1024, max_rom_decode.parallel / 1024, "Parallel"); } - if ((buses & CHIP_BUSTYPE_LPC) && (max_rom_decode.lpc < size)) { + if ((buses & BUS_LPC) && (max_rom_decode.lpc < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " @@ -1099,7 +1099,7 @@ "probe/read/erase/write may fail. ", size / 1024, max_rom_decode.lpc / 1024, "LPC"); } - if ((buses & CHIP_BUSTYPE_FWH) && (max_rom_decode.fwh < size)) { + if ((buses & BUS_FWH) && (max_rom_decode.fwh < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " @@ -1107,7 +1107,7 @@ "probe/read/erase/write may fail. ", size / 1024, max_rom_decode.fwh / 1024, "FWH"); } - if ((buses & CHIP_BUSTYPE_SPI) && (max_rom_decode.spi < size)) { + if ((buses & BUS_SPI) && (max_rom_decode.spi < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " Index: flashrom-chip_bustype_foo_rename/print.c =================================================================== --- flashrom-chip_bustype_foo_rename/print.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/print.c (Arbeitskopie) @@ -33,24 +33,24 @@ char *flashbuses_to_text(enum chipbustype bustype) { char *ret = calloc(1, 1); - if (bustype == CHIP_BUSTYPE_UNKNOWN) { + if (bustype == BUS_UNKNOWN) { ret = strcat_realloc(ret, "Unknown,"); /* * FIXME: Once all chipsets and flash chips have been updated, NONSPI * will cease to exist and should be eliminated here as well. */ - } else if (bustype == CHIP_BUSTYPE_NONSPI) { + } else if (bustype == BUS_NONSPI) { ret = strcat_realloc(ret, "Non-SPI,"); } else { - if (bustype & CHIP_BUSTYPE_PARALLEL) + if (bustype & BUS_PARALLEL) ret = strcat_realloc(ret, "Parallel, "); - if (bustype & CHIP_BUSTYPE_LPC) + if (bustype & BUS_LPC) ret = strcat_realloc(ret, "LPC, "); - if (bustype & CHIP_BUSTYPE_FWH) + if (bustype & BUS_FWH) ret = strcat_realloc(ret, "FWH, "); - if (bustype & CHIP_BUSTYPE_SPI) + if (bustype & BUS_SPI) ret = strcat_realloc(ret, "SPI, "); - if (bustype == CHIP_BUSTYPE_NONE) + if (bustype == BUS_NONE) ret = strcat_realloc(ret, "None, "); } /* Kill last comma. */ Index: flashrom-chip_bustype_foo_rename/board_enable.c =================================================================== --- flashrom-chip_bustype_foo_rename/board_enable.c (Revision 1327) +++ flashrom-chip_bustype_foo_rename/board_enable.c (Arbeitskopie) @@ -424,7 +424,7 @@ /* Check if at least one flash segment is enabled. */ if (tmp & 0xf0) { /* The IT8705F will respond to LPC cycles and translate them. */ - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* Flash ROM I/F Writes Enable */ tmp |= 0x04; msg_pdbg("Enabling IT8705F flash ROM interface write.\n"); -- http://www.hailfinger.org/

2 2

[PATCH] updated motherboards URL in print.c
by Benjamin Bellec 26 Jul '11

26 Jul '11

Hello, Just to stay updated. Benjamin.

5 9

[patch] atavia
by Jonathan A. Kollasch 26 Jul '11

26 Jul '11

Add VIA VT6421A LPC programmer driver. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net>

4 5

[PATCH] Fix out-of-bounds access if all erase functions fail
by Carl-Daniel Hailfinger 26 Jul '11

26 Jul '11

Fix out-of-bounds access if all erase functions fail. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-fix_erasefunctions_nullpointer/flashrom.c =================================================================== --- flashrom-fix_erasefunctions_nullpointer/flashrom.c (Revision 1280) +++ flashrom-fix_erasefunctions_nullpointer/flashrom.c (Arbeitskopie) @@ -1514,8 +1514,12 @@ memcpy(curcontents, oldcontents, size); for (k = 0; k< NUM_ERASEFUNCTIONS; k++) { + if (!usable_erasefunctions) { + msg_cdbg("No usable erase functions left.\n"); + break; + } msg_cdbg("Looking at blockwise erase function %i... ", k); - if (check_block_eraser(flash, k, 1)&& usable_erasefunctions) { + if (check_block_eraser(flash, k, 1)) { msg_cdbg("Looking for another erase function.\n"); continue; } -- http://www.hailfinger.org/

2 17

flashrom virtual machine policy?
by Bernd Blaauw 25 Jul '11

25 Jul '11

What's the Flashrom project's stance on virtualisation/emulation combined with using Flashrom? I've only got some experience with VMware Workstation and not much else with others, but how should a FlashROM that's being run in an emulator react? * Programming a BIOS in a VM seems rather impossible as you can't reach hardware, and BIOS is made up of a file on host system that you haven't got access to. * Erasing same issue. * Reading might be considered possible, but doesn't play nicely along with detecting chipsets etc. Anyway for VMware Workstation 7.1 (x64 on Windows 7 Ultimate x64), and flashrom revision 1322 (latest of Idwer's (auto?-)compiled DOS/DJGGP (or openwatcom, I don't know..) binaries: Short version (the empty line is a missing DMIDECOD.EXE): flashrom v0.9.3-r1322 on FreeDOS 7 (i686), built with libpci 3.1.5, GCC 4.3.2, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "Intel PIIX4/4E/4M", enabling flash write... tried to set 0x4e to 0x2d4 on PIIX4/4E/4M failed (WARNING ONLY) FAILED! This chipset supports the following protocols: Parallel. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. Long/verbose version: flashrom v0.9.3-r1322 on FreeDOS 7 (i686), built with libpci 3.1.5, GCC 4.3.2, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 60000 usecs, 2384M loops per second, 10 myus = 0 us, 100 myus = 0 us, 1000 myus = 0 us, 10000 myus = 0 us, 240000 myus = 280000 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "" DMI string system-product-name: "" DMI string system-version: "" DMI string baseboard-manufacturer: "" DMI string baseboard-product-name: "" DMI string baseboard-version: "" DMI string chassis-type: "" Found chipset "Intel PIIX4/4E/4M", enabling flash write... chipset PCI ID is 8086:7110, tried to set 0x4e to 0x2d4 on PIIX4/4E/4M failed (WARNING ONLY) FAILED! This chipset supports the following protocols: Parallel. Probing for AMD Am29F010A/B, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F080B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BB, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BT, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BB, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BT, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BB, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BT, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A25L05PT, 64 kB: skipped. Probing for AMIC A25L05PU, 64 kB: skipped. Probing for AMIC A25L10PT, 128 kB: skipped. Probing for AMIC A25L10PU, 128 kB: skipped. Probing for AMIC A25L20PT, 256 kB: skipped. Probing for AMIC A25L20PU, 256 kB: skipped. Probing for AMIC A25L40PT, 512 kB: skipped. Probing for AMIC A25L40PU, 512 kB: skipped. Probing for AMIC A25L80P, 1024 kB: skipped. Probing for AMIC A25L16PT, 2048 kB: skipped. Probing for AMIC A25L16PU, 2048 kB: skipped. Probing for AMIC A25L512, 64 kB: skipped. Probing for AMIC A25L010, 128 kB: skipped. Probing for AMIC A25L020, 256 kB: skipped. Probing for AMIC A25L040, 512 kB: skipped. Probing for AMIC A25L080, 1024 kB: skipped. Probing for AMIC A25L016, 2048 kB: skipped. Probing for AMIC A25L032, 4096 kB: skipped. Probing for AMIC A25LQ032, 4096 kB: skipped. Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A49LF040A, 512 kB: skipped. Probing for Atmel AT25DF021, 256 kB: skipped. Probing for Atmel AT25DF041A, 512 kB: skipped. Probing for Atmel AT25DF081, 1024 kB: skipped. Probing for Atmel AT25DF081A, 1024 kB: skipped. Probing for Atmel AT25DF161, 2048 kB: skipped. Probing for Atmel AT25DF321, 4096 kB: skipped. Probing for Atmel AT25DF321A, 4096 kB: skipped. Probing for Atmel AT25DF641, 8192 kB: skipped. Probing for Atmel AT25DQ161, 2048 kB: skipped. Probing for Atmel AT25F512B, 64 kB: skipped. Probing for Atmel AT25FS010, 128 kB: skipped. Probing for Atmel AT25FS040, 512 kB: skipped. Probing for Atmel AT26DF041, 512 kB: skipped. Probing for Atmel AT26DF081A, 1024 kB: skipped. Probing for Atmel AT26DF161, 2048 kB: skipped. Probing for Atmel AT26DF161A, 2048 kB: skipped. Probing for Atmel AT26F004, 512 kB: skipped. Probing for Atmel AT29C512, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C010A, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT45CS1282, 16896 kB: skipped. Probing for Atmel AT45DB011D, 128 kB: skipped. Probing for Atmel AT45DB021D, 256 kB: skipped. Probing for Atmel AT45DB041D, 512 kB: skipped. Probing for Atmel AT45DB081D, 1024 kB: skipped. Probing for Atmel AT45DB161D, 2048 kB: skipped. Probing for Atmel AT45DB321C, 4224 kB: skipped. Probing for Atmel AT45DB321D, 4096 kB: skipped. Probing for Atmel AT45DB642D, 8192 kB: skipped. Probing for Atmel AT49BV512, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N), 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Bright BM29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F49B002UA, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F25L008A, 1024 kB: skipped. Probing for Eon EN25B05, 64 kB: skipped. Probing for Eon EN25B05T, 64 kB: skipped. Probing for Eon EN25B10, 128 kB: skipped. Probing for Eon EN25B10T, 128 kB: skipped. Probing for Eon EN25B20, 256 kB: skipped. Probing for Eon EN25B20T, 256 kB: skipped. Probing for Eon EN25B40, 512 kB: skipped. Probing for Eon EN25B40T, 512 kB: skipped. Probing for Eon EN25B80, 1024 kB: skipped. Probing for Eon EN25B80T, 1024 kB: skipped. Probing for Eon EN25B16, 2048 kB: skipped. Probing for Eon EN25B16T, 2048 kB: skipped. Probing for Eon EN25B32, 4096 kB: skipped. Probing for Eon EN25B32T, 4096 kB: skipped. Probing for Eon EN25B64, 8192 kB: skipped. Probing for Eon EN25B64T, 8192 kB: skipped. Probing for Eon EN25D16, 2048 kB: skipped. Probing for Eon EN25F05, 64 kB: skipped. Probing for Eon EN25F10, 128 kB: skipped. Probing for Eon EN25F20, 256 kB: skipped. Probing for Eon EN25F40, 512 kB: skipped. Probing for Eon EN25F80, 1024 kB: skipped. Probing for Eon EN25F16, 2048 kB: skipped. Probing for Eon EN25F32, 4096 kB: skipped. Probing for Eon EN29F010, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004BC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Hyundai HY29F002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Hyundai HY29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Hyundai HY29F040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-B, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-T, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F002BC/BL/BV/BX-T, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F008S3/S5/SC, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: skipped. Probing for Intel 82802AC, 1024 kB: skipped. Probing for Macronix MX25L512, 64 kB: skipped. Probing for Macronix MX25L1005, 128 kB: skipped. Probing for Macronix MX25L2005, 256 kB: skipped. Probing for Macronix MX25L4005, 512 kB: skipped. Probing for Macronix MX25L8005, 1024 kB: skipped. Probing for Macronix MX25L1605, 2048 kB: skipped. Probing for Macronix MX25L1635D, 2048 kB: skipped. Probing for Macronix MX25L1635E, 2048 kB: skipped. Probing for Macronix MX25L3205, 4096 kB: skipped. Probing for Macronix MX25L3235D, 4096 kB: skipped. Probing for Macronix MX25L6405, 8192 kB: skipped. Probing for Macronix MX25L12805, 16384 kB: skipped. Probing for Macronix MX29F001B, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001T, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000B, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000T, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51400B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51400T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51000, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51001, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51002, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Numonyx M25PE10, 128 kB: skipped. Probing for Numonyx M25PE20, 256 kB: skipped. Probing for Numonyx M25PE40, 512 kB: skipped. Probing for Numonyx M25PE80, 1024 kB: skipped. Probing for Numonyx M25PE16, 2048 kB: skipped. Probing for PMC Pm25LV010, 128 kB: skipped. Probing for PMC Pm25LV016B, 2048 kB: skipped. Probing for PMC Pm25LV020, 256 kB: skipped. Probing for PMC Pm25LV040, 512 kB: skipped. Probing for PMC Pm25LV080B, 1024 kB: skipped. Probing for PMC Pm25LV512, 64 kB: skipped. Probing for PMC Pm29F002T, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002B, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV010, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: skipped. Probing for PMC Pm49FL004, 512 kB: skipped. Probing for Sanyo LF25FW203A, 2048 kB: skipped. Probing for Sharp LHF00L04, 1024 kB: skipped. Probing for Spansion S25FL004A, 512 kB: skipped. Probing for Spansion S25FL008A, 1024 kB: skipped. Probing for Spansion S25FL016A, 2048 kB: skipped. Probing for Spansion S25FL032A, 4096 kB: skipped. Probing for Spansion S25FL064A, 8192 kB: skipped. Probing for SST SST25VF010.REMS, 128 kB: skipped. Probing for SST SST25VF016B, 2048 kB: skipped. Probing for SST SST25VF032B, 4096 kB: skipped. Probing for SST SST25VF064C, 8192 kB: skipped. Probing for SST SST25VF040.REMS, 512 kB: skipped. Probing for SST SST25VF040B, 512 kB: skipped. Probing for SST SST25LF040A.RES, 512 kB: skipped. Probing for SST SST25VF040B.REMS, 512 kB: skipped. Probing for SST SST25VF080B, 1024 kB: skipped. Probing for SST SST28SF040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE010, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE010, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE020A, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF512, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF010A, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF512, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF010, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF080, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: skipped. Probing for SST SST49LF003A/B, 384 kB: skipped. Probing for SST SST49LF004A/B, 512 kB: skipped. Probing for SST SST49LF004C, 512 kB: skipped. Probing for SST SST49LF008A, 1024 kB: skipped. Probing for SST SST49LF008C, 1024 kB: skipped. Probing for SST SST49LF016C, 2048 kB: skipped. Probing for SST SST49LF020, 256 kB: skipped. Probing for SST SST49LF020A, 256 kB: skipped. Probing for SST SST49LF040, 512 kB: skipped. Probing for SST SST49LF040B, 512 kB: skipped. Probing for SST SST49LF080A, 1024 kB: skipped. Probing for SST SST49LF160C, 2048 kB: skipped. Probing for ST M25P05-A, 64 kB: skipped. Probing for ST M25P05.RES, 64 kB: skipped. Probing for ST M25P10-A, 128 kB: skipped. Probing for ST M25P10.RES, 128 kB: skipped. Probing for ST M25P20, 256 kB: skipped. Probing for ST M25P40, 512 kB: skipped. Probing for ST M25P40-old, 512 kB: skipped. Probing for ST M25P80, 1024 kB: skipped. Probing for ST M25P16, 2048 kB: skipped. Probing for ST M25P32, 4096 kB: skipped. Probing for ST M25P64, 8192 kB: skipped. Probing for ST M25P128, 16384 kB: skipped. Probing for ST M25PX16, 2048 kB: skipped. Probing for ST M25PX32, 4096 kB: skipped. Probing for ST M25PX64, 8192 kB: skipped. Probing for ST M29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F400BB, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W512B, 64 kB: probe_jedec_common: id1 0xca, id2 0x2e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: skipped. Probing for ST M50FLW040B, 512 kB: skipped. Probing for ST M50FLW080A, 1024 kB: skipped. Probing for ST M50FLW080B, 1024 kB: skipped. Probing for ST M50FW002, 256 kB: skipped. Probing for ST M50FW016, 2048 kB: skipped. Probing for ST M50FW040, 512 kB: skipped. Probing for ST M50FW080, 1024 kB: skipped. Probing for ST M50LPW116, 2048 kB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W25Q80, 1024 kB: skipped. Probing for Winbond W25Q16, 2048 kB: skipped. Probing for Winbond W25Q32, 4096 kB: skipped. Probing for Winbond W25Q64, 8192 kB: skipped. Probing for Winbond W25Q128, 16384 kB: skipped. Probing for Winbond W25x10, 128 kB: skipped. Probing for Winbond W25x20, 256 kB: skipped. Probing for Winbond W25x40, 512 kB: skipped. Probing for Winbond W25x80, 1024 kB: skipped. Probing for Winbond W25x16, 2048 kB: skipped. Probing for Winbond W25x32, 4096 kB: skipped. Probing for Winbond W25x64, 8192 kB: skipped. Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: probe_jedec_common: id1 0x3b, id2 0xe9, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C020(C)/W29C022, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C040/P, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: Probing disabled for Winbond W29EE011 because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29EE011' if you have a board with this chip. Probing for Winbond W39L040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040A, 512 kB: skipped. Probing for Winbond W39V040B, 512 kB: skipped. Probing for Winbond W39V040C, 512 kB: skipped. Probing for Winbond W39V040FA, 512 kB: skipped. Probing for Winbond W39V040FB, 512 kB: skipped. Probing for Winbond W39V040FC, 512 kB: skipped. Probing for Winbond W39V080A, 1024 kB: skipped. Probing for Winbond W49F002U/N, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002A, 256 kB: skipped. Probing for Winbond W49V002FA, 256 kB: skipped. Probing for Winbond W39V080FA, 1024 kB: skipped. Probing for Winbond W39V080FA (dual mode), 512 kB: skipped. Probing for AMIC unknown AMIC SPI chip, 0 kB: skipped. Probing for Atmel unknown Atmel SPI chip, 0 kB: skipped. Probing for Eon unknown Eon SPI chip, 0 kB: skipped. Probing for Macronix unknown Macronix SPI chip, 0 kB: skipped. Probing for PMC unknown PMC SPI chip, 0 kB: skipped. Probing for SST unknown SST SPI chip, 0 kB: skipped. Probing for ST unknown ST SPI chip, 0 kB: skipped. Probing for Sanyo unknown Sanyo SPI chip, 0 kB: skipped. Probing for Generic unknown SPI chip (RDID), 0 kB: skipped. Probing for Generic unknown SPI chip (REMS), 0 kB: skipped. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. Restoring PCI config space for 00:07:0 reg 0x4e

3 3

Re: [flashrom] [PATCH] be more refined regarding DMI chassis types
by Carl-Daniel Hailfinger 25 Jul '11

25 Jul '11

Am 04.06.2011 10:55 schrieb Stefan Tauner: > we had broken laptops in the past that were not detected as such because their DMI chassis-type was either undefined/out-of-spec, or set to 'other' or 'unknown'. > > this patch tries to mitigate this problem as follows: > - if the DMI chassis-type clearly identifies the system as laptop/notebook/mobile platform then nothing changes: the user gets the laptop warning without a hint to the force switch. > - if the DMI chassis-type is not specific enough, we warn the user similarly, but tell them the switch. > to reduce the number of false positives i have added a few new chassis types that we have encountered in the last months to the list. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > dmi.c | 37 ++++++++++++++++++++++++++----------- > internal.c | 21 +++++++++++++++------ > 2 files changed, 41 insertions(+), 17 deletions(-) > > diff --git a/dmi.c b/dmi.c > index cda6656..5d37b76 100644 > --- a/dmi.c > +++ b/dmi.c > @@ -54,7 +54,13 @@ static const char *dmidecode_names[] = { > "baseboard-version", > }; > > -/* A full list of chassis types can be found in the System Management BIOS > +/* This list is used to identify supposed laptops. The is_laptop field has the > + * following meaning: > + * - 0: in all likelihood not a laptop > + * - 1: in all likelihood a laptop > + * - 2: chassis-type is not specific enough (these do not need to be listed > + * in the table, because it is the default anyway) > + * A full list of chassis types can be found in the System Management BIOS > * (SMBIOS) Reference Specification 2.7.0 section 7.4.1 "Chassis Types" at > * http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.0.p… > * The types below are the most common ones. > @@ -64,14 +70,16 @@ static const struct { > unsigned char is_laptop; > const char *name; > } dmi_chassis_types[] = { > - {0x01, 0, "Other"}, > - {0x02, 0, "Unknown"}, > Why remove those lines? Use 2 for undecided cases. Removing these lines will make it harder later to integrate the DMI decoder (we currently rely on external dmidecode and that fails quite often due to dmidecode not being installed etc.). The DMI decoder integration patch was posted some time ago to the list, but it needs to be redone/cleaned up significantly before we can merge it. > {0x03, 0, "Desktop",}, > + {0x06, 0, "Mini Tower"}, > + {0x07, 0, "Tower"}, > {0x08, 1, "Portable"}, > {0x09, 1, "Laptop"}, > {0x0a, 1, "Notebook"}, > {0x0b, 1, "Hand Held"}, > {0x0e, 1, "Sub Notebook"}, > + {0x11, 0, "Main Server Chassis"}, > + {0x17, 0, "Rack Mount Chassis"}, > }; > > #define DMI_COMMAND_LEN_MAX 260 > @@ -152,16 +160,23 @@ void dmi_init(void) > } > > chassis_type = get_dmi_string("chassis-type"); > - if (chassis_type) { > - for (i = 0; i < ARRAY_SIZE(dmi_chassis_types); i++) { > - if (!strcasecmp(chassis_type, > - dmi_chassis_types[i].name) && > - dmi_chassis_types[i].is_laptop) { > - msg_pdbg("Laptop detected via DMI\n"); > - is_laptop = 1; > - } > + if (chassis_type == NULL) > + return; > + > is_laptop = 2; > + for (i = 0; i < ARRAY_SIZE(dmi_chassis_types); i++) { > + if (strcasecmp(chassis_type, dmi_chassis_types[i].name) == 0) { > + is_laptop = dmi_chassis_types[i].is_laptop; > break; > + if (is_laptop == 1) { > + msg_pdbg("Laptop detected via DMI.\n"); > + free(chassis_type); > + return; > + } else > + break; /* first match breaks loop */ > Can you kill the whole inner if statement? > } > } > + > + msg_pdbg("DMI chassis-type is not specific enough.\n"); > Please use this instead (my whitespace is broken, I know): switch (is_laptop) { case 1: msg_pdbg("Laptop detected via DMI.\n"); break; case 2: msg_pdbg("DMI chassis-type is not specific enough.\n"); break; } > + is_laptop = 2; > Kill the assignment above. > free(chassis_type); > } > > diff --git a/internal.c b/internal.c > index c9f62c1..bbcdc5b 100644 > --- a/internal.c > +++ b/internal.c > @@ -124,7 +124,7 @@ int register_superio(struct superio s) > > #endif > > -int is_laptop = 0; > +int is_laptop = -1; > This changes the logic. With this change, flashrom assumes that every machine is a laptop, and that will bite us everywhere dmidecode is unavailable. Please review your changes below in light of that. > int laptop_ok = 0; > > int internal_init(void) > @@ -222,11 +222,19 @@ int internal_init(void) > > /* Warn if a non-whitelisted laptop is detected. */ > if (is_laptop && !laptop_ok) { > - msg_perr("========================================================================\n" > - "WARNING! You seem to be running flashrom on an unsupported laptop.\n" > - "Laptops, notebooks and netbooks are difficult to support and we recommend\n" > - "to use the vendor flashing utility. The embedded controller (EC) in these\n" > - "machines often interacts badly with flashing.\n" > + msg_perr("========================================================================\n"); > + if (is_laptop == 1) { > + msg_perr("WARNING! You seem to be running flashrom on an unsupported laptop.\n"); > + } else { > + msg_perr("WARNING! You may be running flashrom on an unsupported laptop. We could\n" > + "not detect this for sure because your vendor has not setup the SMBIOS\n" > + "tables correctly. You can enforce execution by adding\n" > + "'-p internal:laptop=force_I_want_a_brick' to the command line, but\n" > + "please read the following warning if you are not sure.\n\n"); > + } > + msg_perr("Laptops, notebooks and netbooks are difficult to support and we\n" > + "recommend to use the vendor flashing utility. The embedded controller\n" > + "(EC) in these machines often interacts badly with flashing.\n" > "See http://www.flashrom.org/Laptops for details.\n\n" > "If flash is shared with the EC, erase is guaranteed to brick your laptop\n" > "and write may brick your laptop.\n" > @@ -234,6 +242,7 @@ int internal_init(void) > "failure and sudden poweroff.\n" > "You have been warned.\n" > "========================================================================\n"); > + > if (force_laptop) { > msg_perr("Proceeding anyway because user specified " > "laptop=force_I_want_a_brick\n"); > Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

[PATCH] satamv.c requires PCI port I/O
by Andrew Morgan 25 Jul '11

25 Jul '11

satamv.c requires PCI port I/O which isn't currently available on anything other than x86/x86_64. Generate the same compiler error as other programmers eg. rayer_spi.c, which is where I copied the code from. Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> -- Andrew.

3 2

[PATCH] flashrom: fix sparse warning: Using plain integer as NULL pointer
by Peter Hüwe 25 Jul '11

25 Jul '11

flashrom: fix sparse warning: Using plain integer as NULL pointer This patch fixes the "using plain integer as NULL pointer" warnings generated by running sparse on the flashrom source. Flashrom-Version: r1254 Signed-off-by: Peter Huewe <peterhuewe(a)gmx.de> --- cbtable.c | 2 +- chipset_enable.c | 2 +- cli_classic.c | 34 +++++++++++++++++----------------- physmap.c | 4 ++-- programmer.c | 2 +- serprog.c | 2 +- udelay.c | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cbtable.c b/cbtable.c index dbb2cff..f30a3ae 100644 --- a/cbtable.c +++ b/cbtable.c @@ -141,7 +141,7 @@ static struct lb_header *find_lb_table(void *base, unsigned long start, }; - return 0; + return NULL; } static void find_mainboard(struct lb_record *ptr, unsigned long addr) diff --git a/chipset_enable.c b/chipset_enable.c index 6d6008e..0896bce 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1173,7 +1173,7 @@ const struct penable chipset_enables[] = { int chipset_flash_enable(void) { - struct pci_dev *dev = 0; + struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ int i; diff --git a/cli_classic.c b/cli_classic.c index 1211989..88b70db 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -116,23 +116,23 @@ int cli_classic(int argc, char *argv[]) static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { - {"read", 1, 0, 'r'}, - {"write", 1, 0, 'w'}, - {"erase", 0, 0, 'E'}, - {"verify", 1, 0, 'v'}, - {"noverify", 0, 0, 'n'}, - {"chip", 1, 0, 'c'}, - {"mainboard", 1, 0, 'm'}, - {"verbose", 0, 0, 'V'}, - {"force", 0, 0, 'f'}, - {"layout", 1, 0, 'l'}, - {"image", 1, 0, 'i'}, - {"list-supported", 0, 0, 'L'}, - {"list-supported-wiki", 0, 0, 'z'}, - {"programmer", 1, 0, 'p'}, - {"help", 0, 0, 'h'}, - {"version", 0, 0, 'R'}, - {0, 0, 0, 0} + {"read", 1, NULL, 'r'}, + {"write", 1, NULL, 'w'}, + {"erase", 0, NULL, 'E'}, + {"verify", 1, NULL, 'v'}, + {"noverify", 0, NULL, 'n'}, + {"chip", 1, NULL, 'c'}, + {"mainboard", 1, NULL, 'm'}, + {"verbose", 0, NULL, 'V'}, + {"force", 0, NULL, 'f'}, + {"layout", 1, NULL, 'l'}, + {"image", 1, NULL, 'i'}, + {"list-supported", 0, NULL, 'L'}, + {"list-supported-wiki", 0, NULL, 'z'}, + {"programmer", 1, NULL, 'p'}, + {"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'R'}, + {NULL, 0, NULL, 0} }; char *filename = NULL; diff --git a/physmap.c b/physmap.c index 4641e8e..70156a6 100644 --- a/physmap.c +++ b/physmap.c @@ -180,7 +180,7 @@ static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_WRITE | PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_WRITE | PROT_READ, MAP_SHARED, fd_mem, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } @@ -200,7 +200,7 @@ static void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd_mem_cached, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } diff --git a/programmer.c b/programmer.c index 0160867..5c1f963 100644 --- a/programmer.c +++ b/programmer.c @@ -30,7 +30,7 @@ int noop_shutdown(void) void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { /* FIXME: Should return phys_addr. */ - return 0; + return NULL; } /* No-op/fallback unmap() for programmers which don't need special handling */ diff --git a/serprog.c b/serprog.c index 2cdfea6..f869b07 100644 --- a/serprog.c +++ b/serprog.c @@ -541,7 +541,7 @@ static void sp_execute_opbuf_noflush(void) { if ((sp_max_write_n) && (sp_write_n_bytes)) sp_pass_writen(); - sp_stream_buffer_op(S_CMD_O_EXEC, 0, 0); + sp_stream_buffer_op(S_CMD_O_EXEC, 0, NULL); msg_pspew(MSGHEADER "Executed operation buffer of %d bytes\n", sp_opbuf_usage); sp_opbuf_usage = 0; diff --git a/udelay.c b/udelay.c index 153f510..feae827 100644 --- a/udelay.c +++ b/udelay.c @@ -45,11 +45,11 @@ static unsigned long measure_os_delay_resolution(void) struct timeval start, end; unsigned long counter = 0; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); timeusec = 0; while (!timeusec && (++counter < 1000000000)) { - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ @@ -68,9 +68,9 @@ static unsigned long measure_delay(int usecs) unsigned long timeusec; struct timeval start, end; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); myusec_delay(usecs); - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ -- 1.7.2.2

3 2

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2011