flashrom

flashrom@flashrom.org

5 participants
9161 discussions

flashrom output
by Paul Stotts 28 Jul '11

28 Jul '11

sudo flashrom -V flashrom v0.9.2-r1141 on Linux 2.6.38-10-generic (x86_64), built with libpci 3.1.7, GCC 4.5.1, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 1 usecs, 932M loops per second, 10 myus = 10 us, 100 myus = 100 us, 1000 myus = 999 us, 10000 myus = 10026 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "HP-Pavilion" DMI string system-product-name: "AY748AA-ABA p6320y" DMI string system-version: " " DMI string baseboard-manufacturer: "PEGATRON CORPORATION" DMI string baseboard-product-name: "VIOLET6" DMI string baseboard-version: "6.01" DMI string chassis-type: "Desktop" Found chipset "NVIDIA MCP78S", enabling flash write... chipset PCI ID is 10de:075c, This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x40, bit 6 is 1, bit 5 is 0 Flash bus type is SPI SPI on this chipset is WIP. Write is unsupported! Found SMBus device 10de:0752 at 00:01:1 MCP SPI BAR is at 0xfce80000 Mapping NVIDIA MCP6x SPI at 0xfce80000, unaligned size 0x544. SPI control is 0xc012, req=0, gnt=0 Please send the output of "flashrom -V" to flashrom(a)flashrom.org to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: SPI. Probing for AMD Am29F010A/B, 128 KB: skipped. Probing for AMD Am29F002(N)BB, 256 KB: skipped. Probing for AMD Am29F002(N)BT, 256 KB: skipped. Probing for AMD Am29F016D, 2048 KB: skipped. Probing for AMD Am29F040B, 512 KB: skipped. Probing for AMD Am29F080B, 1024 KB: skipped. Probing for AMD Am29LV040B, 512 KB: skipped. Probing for AMD Am29LV081B, 1024 KB: skipped. Probing for AMIC A25L05PT, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L05PU, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L10PT, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L10PU, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L20PT, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L20PU, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L40PT, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L40PU, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L80P, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L16PT, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L16PU, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L020, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L080, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L016, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25L032, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A25LQ032, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for AMIC A29002B, 256 KB: skipped. Probing for AMIC A29002T, 256 KB: skipped. Probing for AMIC A29040B, 512 KB: skipped. Probing for AMIC A49LF040A, 512 KB: skipped. Probing for ASD AE49F2008, 256 KB: skipped. Probing for Atmel AT25DF021, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF041A, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF081, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF321, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF321A, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DF641, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25DQ161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25F512B, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25FS010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT25FS040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT26DF041, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT26DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT26DF161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT26DF161A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT26F004, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT29C512, 64 KB: skipped. Probing for Atmel AT29C010A, 128 KB: skipped. Probing for Atmel AT29C020, 256 KB: skipped. Probing for Atmel AT29C040A, 512 KB: skipped. Probing for Atmel AT45CS1282, 16896 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB011D, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB021D, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB041D, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB081D, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB161D, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB321C, 4224 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB321D, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT45DB642D, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel AT49BV512, 64 KB: skipped. Probing for Atmel AT49F020, 256 KB: skipped. Probing for Atmel AT49F002(N), 256 KB: skipped. Probing for Atmel AT49F002(N)T, 256 KB: skipped. Probing for EMST F49B002UA, 256 KB: skipped. Probing for EMST F25L008A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B05, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B05T, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B10T, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B20T, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B40T, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B80T, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B16T, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B32T, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25B64T, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25D16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F05, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN25F32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon EN29F010, 128 KB: skipped. Probing for Eon EN29F002(A)(N)B, 256 KB: skipped. Probing for Eon EN29F002(A)(N)T, 256 KB: skipped. Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Probing for Hyundai HY29F002T, 256 KB: skipped. Probing for Hyundai HY29F002B, 256 KB: skipped. Probing for Intel 28F001BX-B, 128 KB: skipped. Probing for Intel 28F001BX-T, 128 KB: skipped. Probing for Intel 28F002BC-T, 256 KB: skipped. Probing for Intel 28F004S5, 512 KB: skipped. Probing for Intel 28F004BV/BE-B, 512 KB: skipped. Probing for Intel 28F004BV/BE-T, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-B, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-T, 512 KB: skipped. Probing for Intel 82802AB, 512 KB: skipped. Probing for Intel 82802AC, 1024 KB: skipped. Probing for Macronix MX25L512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L1005, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L2005, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L4005, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L8005, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L1605, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L1635D, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L3205, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L3235D, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L6405, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX25L12805, 16384 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix MX29F001B, 128 KB: skipped. Probing for Macronix MX29F001T, 128 KB: skipped. Probing for Macronix MX29F002B, 256 KB: skipped. Probing for Macronix MX29F002T, 256 KB: skipped. Probing for Macronix MX29LV040, 512 KB: skipped. Probing for MoselVitelic V29C51000B, 64 KB: skipped. Probing for MoselVitelic V29C51000T, 64 KB: skipped. Probing for MoselVitelic V29C51400B, 512 KB: skipped. Probing for MoselVitelic V29C51400T, 512 KB: skipped. Probing for MoselVitelic V29LC51000, 64 KB: skipped. Probing for MoselVitelic V29LC51001, 128 KB: skipped. Probing for MoselVitelic V29LC51002, 256 KB: skipped. Probing for Numonyx M25PE10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Numonyx M25PE20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Numonyx M25PE40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Numonyx M25PE80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Numonyx M25PE16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV016B, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV020, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV080B, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm25LV512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC Pm29F002T, 256 KB: skipped. Probing for PMC Pm29F002B, 256 KB: skipped. Probing for PMC Pm39LV010, 128 KB: skipped. Probing for PMC Pm39LV020, 256 KB: skipped. Probing for PMC Pm39LV040, 512 KB: skipped. Probing for PMC Pm49FL002, 256 KB: skipped. Probing for PMC Pm49FL004, 512 KB: skipped. Probing for Sanyo LF25FW203A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Sharp LHF00L04, 1024 KB: skipped. Probing for Spansion S25FL008A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Spansion S25FL016A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST25VF016B, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST25VF032B, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST25VF064C, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST25VF040.REMS, 512 KB: probe_spi_rems: id1 0xef, id2 0x13 Probing for SST SST25VF040B, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST25LF040A.RES, 512 KB: probe_spi_res2: id1 0x13, id2 0x13 Probing for SST SST25VF040B.REMS, 512 KB: probe_spi_rems: id1 0xef, id2 0x13 Probing for SST SST25VF080B, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST SST28SF040A, 512 KB: skipped. Probing for SST SST29EE010, 128 KB: skipped. Probing for SST SST29LE010, 128 KB: skipped. Probing for SST SST29EE020A, 256 KB: skipped. Probing for SST SST29LE020, 256 KB: skipped. Probing for SST SST39SF512, 64 KB: skipped. Probing for SST SST39SF010A, 128 KB: skipped. Probing for SST SST39SF020A, 256 KB: skipped. Probing for SST SST39SF040, 512 KB: skipped. Probing for SST SST39VF512, 64 KB: skipped. Probing for SST SST39VF010, 128 KB: skipped. Probing for SST SST39VF020, 256 KB: skipped. Probing for SST SST39VF040, 512 KB: skipped. Probing for SST SST39VF080, 1024 KB: skipped. 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: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P05.RES, 64 KB: Ignoring RES in favour of RDID. Probing for ST M25P10-A, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P10.RES, 128 KB: Ignoring RES in favour of RDID. Probing for ST M25P20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P40-old, 512 KB: Ignoring RES in favour of RDID. Probing for ST M25P80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M25P128, 16384 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST M29F002B, 256 KB: skipped. Probing for ST M29F002T/NT, 256 KB: skipped. Probing for ST M29F040B, 512 KB: skipped. Probing for ST M29F400BB, 512 KB: skipped. Probing for ST M29F400BT, 512 KB: skipped. Probing for ST M29W010B, 128 KB: skipped. Probing for ST M29W040B, 512 KB: skipped. Probing for ST M29W512B, 64 KB: skipped. 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: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 KB: skipped. Probing for TI TMS29F002RB, 256 KB: skipped. Probing for TI TMS29F002RT, 256 KB: skipped. Probing for Winbond W25Q80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25Q16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25Q32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25Q64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Chip status register is 00 Found chip "Winbond W25x80" (1024 KB, SPI) at physical address 0xfff00000. Probing for Winbond W25x16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W25x64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Winbond W29C011, 128 KB: skipped. Probing for Winbond W29C020C, 256 KB: skipped. Probing for Winbond W29C040P, 512 KB: skipped. Probing for Winbond W29EE011, 128 KB: skipped. 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 W39V080A, 1024 KB: skipped. Probing for Winbond W49F002U, 256 KB: skipped. Probing for Winbond W49F020, 256 KB: skipped. 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: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Atmel unknown Atmel SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Eon unknown Eon SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Macronix unknown Macronix SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for PMC unknown PMC SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for SST unknown SST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for ST unknown ST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Sanyo unknown Sanyo SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Generic unknown SPI chip (RDID), 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x3014 Probing for Generic unknown SPI chip (REMS), 0 KB: probe_spi_rems: id1 0xef, id2 0x13 No operations were specified.

1 0

Re: [flashrom] flashrom on PowerPC
by Andrew Morgan 28 Jul '11

28 Jul '11

Not much to add, I've also tested this patch and it works (probe + read) on my PowerPC Mac Mini. Apparently a more common machine to run Linux on than I thought! According to /proc/cpuinfo it is a PowerMac10,1. Detected was a Sharp LH28F008BJT-BTLZ1, unlike on your PowerMac10,1. -- Andrew.

1 0

Re: [flashrom] AMD SB700/SB710/SB750/SB850 and Eon EN25F80
by Stefan Tauner 28 Jul '11

28 Jul '11

On Wed, 27 Jul 2011 18:21:24 +0400 Иван Кинаш <ivan(a)kinash.org> wrote: > You are absolutely correct, my motherboard is the second one. thanks! > > And I'd like to report that after flashing MAC address of integrated network > adapter was lost. that is to be expected because this information needs to be read out before the update and saved after/during the update. we don't do that for two reasons. 1. we don't know where this information is stored on the various boards. 2. even then i am not sure it is flashrom's goal to do that on its own, but until problem #1 is solved we don't need to decide #2 ;) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] flashrom on PowerPC
by Peter Lemenkov 27 Jul '11

27 Jul '11

2011/7/27 Mattias Mattsson <vitplister(a)gmail.com>: > Hi all, > > I was able to run flashrom under Linux on PPC (big endian) hardware > with two small modifications in internal.c and processor_enable.c (see > attached patch). Not sure if this is the right way to do it but it > seems to work for me. Confirmed on my Mac Mini G4 - it does work as expected. Thanks for this amazing hack, Mattias! -- With best regards, Peter Lemenkov.

1 0

flashrom on PowerPC
by Mattias Mattsson 27 Jul '11

27 Jul '11

Hi all, I was able to run flashrom under Linux on PPC (big endian) hardware with two small modifications in internal.c and processor_enable.c (see attached patch). Not sure if this is the right way to do it but it seems to work for me. Note that for Apple hardware you have to use a special power on method to make the flash chip accessible (hold power button until beep). On some models you have to press and hold an additional button on the machine ("programmer's button") or keyboard ("Command"). http://support.apple.com/kb/HT2322 http://support.apple.com/kb/DL1284 http://support.apple.com/kb/DL1126 I have tested this on two pieces of Apple hardware: "Mac Mini" (model ID: PowerMac10,1) and "Mac mini (Late 2005)" (model ID: PowerMac10,2): http://support.apple.com/kb/ht3476 By taking the hardware apart I can confirm they have the following flash chips: PowerMac10,1: AMD Am29LV008BB-90EC PowerMac10,2: SHARP LH28F008BJT-BTLZ1 Flash chips seem to be mapped top-aligned in the 4GB address space. Looking at the Open Firmware forth code inside Apple's own firmware updates also suggests this is the case. I was able to probe, read, write and erase on both machines. Read files seem to contain valid data. Added support for LH28F008BJT-BTLZ1 and marked Am29LV008B as fully tested. Logs and patches attached. Please tell me if I should test something else! Thanks, -mattias

1 0

Re: [flashrom] AMD SB700/SB710/SB750/SB850 and Eon EN25F80
by Stefan Tauner 27 Jul '11

27 Jul '11

On Fri, 22 Jul 2011 23:38:33 +0400 Иван Кинаш <ivan(a)kinash.org> wrote: Hello Иван, Thanks for your report! I have marked the flash chip as fully tested and will commit that later. I have also marked the M4A785TD-V EVO as supported, but i'd like to verify that it is the correct board. there are two versions: one with 6 Gbps SATA and USB3 (named M4A785TD-V EVO/U3S6) http://www.asus.com/product.aspx?P_ID=Ic2Z48E0qdz0KwIU and one without those (named M4A785TD-V EVO) http://www.asus.com/product.aspx?P_ID=fcsXWSxnhzZE9rnR Your board is the second one, correct? Thanks! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

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

[commit] r1396 - trunk
by repository service 27 Jul '11

27 Jul '11

Author: hailfinger Date: Wed Jul 27 09:13:06 2011 New Revision: 1396 URL: http://flashrom.org/trac/flashrom/changeset/1396 Log: Rename CHIP_BUSTYPE_FOO to BUS_FOO. It's shorter to type, and we have less problems with the 80 column limit. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/atahpt.c trunk/board_enable.c trunk/chipset_enable.c trunk/drkaiser.c trunk/dummyflasher.c trunk/flash.h trunk/flashchips.c trunk/flashrom.c trunk/gfxnvidia.c trunk/ichspi.c trunk/internal.c trunk/it85spi.c trunk/it87spi.c trunk/nic3com.c trunk/nicintel.c trunk/nicnatsemi.c trunk/nicrealtek.c trunk/print.c trunk/satamv.c trunk/satasii.c trunk/serprog.c trunk/spi.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/atahpt.c Wed Jul 27 09:13:06 2011 (r1396) @@ -61,7 +61,7 @@ reg32 |= (1 << 24); rpci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; if (register_shutdown(atahpt_shutdown, NULL)) return 1; Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/board_enable.c Wed Jul 27 09:13:06 2011 (r1396) @@ -425,7 +425,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"); Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/chipset_enable.c Wed Jul 27 09:13:06 2011 (r1396) @@ -210,7 +210,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); @@ -297,7 +297,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); } @@ -414,7 +414,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); } @@ -434,7 +434,7 @@ if (new != old) rpci_write_byte(dev, 0xd9, new); - buses_supported = CHIP_BUSTYPE_FWH; + buses_supported = BUS_FWH; return 0; } @@ -487,7 +487,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 */ @@ -498,7 +498,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; @@ -586,7 +586,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 @@ -736,7 +736,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); @@ -822,7 +822,7 @@ { uint8_t tmp; - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; tmp = INB(0xc06); tmp |= 0x1; @@ -922,7 +922,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: @@ -930,7 +930,7 @@ /* 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_pinfo("SPI on this chipset is WIP. Please report any " "success or failure by mailing us the verbose " @@ -938,7 +938,7 @@ 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; Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/drkaiser.c Wed Jul 27 09:13:06 2011 (r1396) @@ -64,7 +64,7 @@ drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", addr, DRKAISER_MEMMAP_SIZE); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; if (register_shutdown(drkaiser_shutdown, NULL)) return 1; Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/dummyflasher.c Wed Jul 27 09:13:06 2011 (r1396) @@ -107,24 +107,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); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/flash.h Wed Jul 27 09:13:06 2011 (r1396) @@ -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, }; /* Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/flashchips.c Wed Jul 27 09:13:06 2011 (r1396) @@ -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, @@ -151,7 +151,7 @@ { .vendor = "AMD", .name = "Am29F016D", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F016D, .total_size = 2 * 1024, @@ -178,7 +178,7 @@ { .vendor = "AMD", .name = "Am29F040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F040B, .total_size = 512, @@ -205,7 +205,7 @@ { .vendor = "AMD", .name = "Am29F080B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29F080B, .total_size = 1024, @@ -232,7 +232,7 @@ { .vendor = "AMD", .name = "Am29LV001BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV001BB, .total_size = 128, @@ -263,7 +263,7 @@ { .vendor = "AMD", .name = "Am29LV001BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV001BT, .total_size = 128, @@ -294,7 +294,7 @@ { .vendor = "AMD", .name = "Am29LV002BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV002BB, .total_size = 256, @@ -326,7 +326,7 @@ { .vendor = "AMD", .name = "Am29LV002BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV002BT, .total_size = 256, @@ -358,7 +358,7 @@ { .vendor = "AMD", .name = "Am29LV004BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV004BB, .total_size = 512, @@ -390,7 +390,7 @@ { .vendor = "AMD", .name = "Am29LV004BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV004BT, .total_size = 512, @@ -422,7 +422,7 @@ { .vendor = "AMD", .name = "Am29LV008BB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV008BB, .total_size = 1024, @@ -454,7 +454,7 @@ { .vendor = "AMD", .name = "Am29LV008BT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV008BT, .total_size = 1024, @@ -486,7 +486,7 @@ { .vendor = "AMD", .name = "Am29LV040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV040B, .total_size = 512, @@ -513,7 +513,7 @@ { .vendor = "AMD", .name = "Am29LV081B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, .model_id = AMD_AM29LV080B, .total_size = 1024, @@ -540,7 +540,7 @@ { .vendor = "AMIC", .name = "A25L05PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L05PT, .total_size = 64, @@ -573,7 +573,7 @@ { .vendor = "AMIC", .name = "A25L05PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L05PU, .total_size = 64, @@ -606,7 +606,7 @@ { .vendor = "AMIC", .name = "A25L10PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L10PT, .total_size = 128, @@ -640,7 +640,7 @@ { .vendor = "AMIC", .name = "A25L10PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L10PU, .total_size = 128, @@ -674,7 +674,7 @@ { .vendor = "AMIC", .name = "A25L20PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L20PT, .total_size = 256, @@ -708,7 +708,7 @@ { .vendor = "AMIC", .name = "A25L20PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L20PU, .total_size = 256, @@ -747,7 +747,7 @@ { .vendor = "AMIC", .name = "A25L40PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L40PT, .total_size = 512, @@ -781,7 +781,7 @@ { .vendor = "AMIC", .name = "A25L40PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L40PU, .total_size = 512, @@ -815,7 +815,7 @@ { .vendor = "AMIC", .name = "A25L80P", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L80P, .total_size = 1024, @@ -849,7 +849,7 @@ { .vendor = "AMIC", .name = "A25L16PT", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L16PT, .total_size = 2048, @@ -886,7 +886,7 @@ { .vendor = "AMIC", .name = "A25L16PU", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID, .model_id = AMIC_A25L16PU, .total_size = 2048, @@ -923,7 +923,7 @@ { .vendor = "AMIC", .name = "A25L512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L512, .total_size = 64, @@ -955,7 +955,7 @@ { .vendor = "AMIC", .name = "A25L010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L010, .total_size = 128, @@ -987,7 +987,7 @@ { .vendor = "AMIC", .name = "A25L020", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L020, .total_size = 256, @@ -1019,7 +1019,7 @@ { .vendor = "AMIC", .name = "A25L040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L040, .total_size = 512, @@ -1051,7 +1051,7 @@ { .vendor = "AMIC", .name = "A25L080", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L080, .total_size = 1024, @@ -1083,7 +1083,7 @@ { .vendor = "AMIC", .name = "A25L016", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L016, .total_size = 2048, @@ -1115,7 +1115,7 @@ { .vendor = "AMIC", .name = "A25L032", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25L032, .total_size = 4096, @@ -1153,7 +1153,7 @@ { .vendor = "AMIC", .name = "A25LQ032", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A25LQ032, .total_size = 4096, @@ -1191,7 +1191,7 @@ { .vendor = "AMIC", .name = "A29002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29002B, .total_size = 256, @@ -1223,7 +1223,7 @@ { .vendor = "AMIC", .name = "A29002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29002T, .total_size = 256, @@ -1255,7 +1255,7 @@ { .vendor = "AMIC", .name = "A29040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A29040B, .total_size = 512, @@ -1282,7 +1282,7 @@ { .vendor = "AMIC", .name = "A49LF040A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = AMIC_ID_NOPREFIX, .model_id = AMIC_A49LF040A, .total_size = 512, @@ -1310,7 +1310,7 @@ { .vendor = "Atmel", .name = "AT25DF021", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF021, .total_size = 256, @@ -1348,7 +1348,7 @@ { .vendor = "Atmel", .name = "AT25DF041A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF041A, .total_size = 512, @@ -1386,7 +1386,7 @@ { .vendor = "Atmel", .name = "AT25DF081", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF081, .total_size = 1024, @@ -1424,7 +1424,7 @@ { .vendor = "Atmel", .name = "AT25DF081A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF081A, .total_size = 1024, @@ -1462,7 +1462,7 @@ { .vendor = "Atmel", .name = "AT25DF161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF161, .total_size = 2048, @@ -1500,7 +1500,7 @@ { .vendor = "Atmel", .name = "AT25DF321", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF321, .total_size = 4096, @@ -1538,7 +1538,7 @@ { .vendor = "Atmel", .name = "AT25DF321A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF321A, .total_size = 4096, @@ -1576,7 +1576,7 @@ { .vendor = "Atmel", .name = "AT25DF641", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DF641, .total_size = 8192, @@ -1614,7 +1614,7 @@ { .vendor = "Atmel", .name = "AT25DQ161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25DQ161, .total_size = 2048, @@ -1652,7 +1652,7 @@ { .vendor = "Atmel", .name = "AT25F512B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25F512B, .total_size = 64, @@ -1690,7 +1690,7 @@ { .vendor = "Atmel", .name = "AT25FS010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25FS010, .total_size = 128, @@ -1730,7 +1730,7 @@ { .vendor = "Atmel", .name = "AT25FS040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT25FS040, .total_size = 512, @@ -1767,7 +1767,7 @@ { .vendor = "Atmel", .name = "AT26DF041", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF041, .total_size = 512, @@ -1790,7 +1790,7 @@ { .vendor = "Atmel", .name = "AT26DF081A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF081A, .total_size = 1024, @@ -1828,7 +1828,7 @@ { .vendor = "Atmel", .name = "AT26DF161", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF161, .total_size = 2048, @@ -1865,7 +1865,7 @@ { .vendor = "Atmel", .name = "AT26DF161A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF161A, .total_size = 2048, @@ -1903,7 +1903,7 @@ /*{ .vendor = "Atmel", .name = "AT26DF321", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26DF321, .total_size = 4096, @@ -1920,7 +1920,7 @@ { .vendor = "Atmel", .name = "AT26F004", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT26F004, .total_size = 512, @@ -1955,7 +1955,7 @@ { .vendor = "Atmel", .name = "AT29C512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C512, .total_size = 64, @@ -1979,7 +1979,7 @@ { .vendor = "Atmel", .name = "AT29C010A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C010A, .total_size = 128, @@ -2003,7 +2003,7 @@ { .vendor = "Atmel", .name = "AT29C020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C020, .total_size = 256, @@ -2027,7 +2027,7 @@ { .vendor = "Atmel", .name = "AT29C040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT29C040A, .total_size = 512, @@ -2051,7 +2051,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 */, @@ -2067,7 +2067,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 */, @@ -2083,7 +2083,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 */, @@ -2099,7 +2099,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 */, @@ -2115,7 +2115,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 */, @@ -2131,7 +2131,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 */, @@ -2147,7 +2147,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 */, @@ -2163,7 +2163,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 */, @@ -2179,7 +2179,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 */, @@ -2195,7 +2195,7 @@ { .vendor = "Atmel", .name = "AT49BV512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49BV512, .total_size = 64, @@ -2219,7 +2219,7 @@ { .vendor = "Atmel", .name = "AT49F020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F020, .total_size = 256, @@ -2243,7 +2243,7 @@ { .vendor = "Atmel", .name = "AT49F002(N)", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F002N, .total_size = 256, @@ -2275,7 +2275,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, @@ -2307,7 +2307,7 @@ { .vendor = "Bright", .name = "BM29F040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = BRIGHT_ID, .model_id = BRIGHT_BM29F040, .total_size = 512, @@ -2334,7 +2334,7 @@ { .vendor = "EMST", .name = "F49B002UA", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EMST_ID, .model_id = EMST_F49B002UA, .total_size = 256, @@ -2366,7 +2366,7 @@ { .vendor = "EMST", .name = "F25L008A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EMST_ID, .model_id = EMST_F25L008A, .total_size = 1024, @@ -2399,7 +2399,7 @@ { .vendor = "Eon", .name = "EN25B05", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B05, .total_size = 64, @@ -2431,7 +2431,7 @@ { .vendor = "Eon", .name = "EN25B05T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B05, .total_size = 64, @@ -2463,7 +2463,7 @@ { .vendor = "Eon", .name = "EN25B10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B10, .total_size = 128, @@ -2495,7 +2495,7 @@ { .vendor = "Eon", .name = "EN25B10T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B10, .total_size = 128, @@ -2527,7 +2527,7 @@ { .vendor = "Eon", .name = "EN25B20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B20, .total_size = 256, @@ -2560,7 +2560,7 @@ { .vendor = "Eon", .name = "EN25B20T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B20, .total_size = 256, @@ -2593,7 +2593,7 @@ { .vendor = "Eon", .name = "EN25B40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B40, .total_size = 512, @@ -2626,7 +2626,7 @@ { .vendor = "Eon", .name = "EN25B40T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B40, .total_size = 512, @@ -2659,7 +2659,7 @@ { .vendor = "Eon", .name = "EN25B80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B80, .total_size = 1024, @@ -2692,7 +2692,7 @@ { .vendor = "Eon", .name = "EN25B80T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B80, .total_size = 1024, @@ -2725,7 +2725,7 @@ { .vendor = "Eon", .name = "EN25B16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B16, .total_size = 2048, @@ -2758,7 +2758,7 @@ { .vendor = "Eon", .name = "EN25B16T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B16, .total_size = 2048, @@ -2791,7 +2791,7 @@ { .vendor = "Eon", .name = "EN25B32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B32, .total_size = 4096, @@ -2824,7 +2824,7 @@ { .vendor = "Eon", .name = "EN25B32T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B32, .total_size = 4096, @@ -2857,7 +2857,7 @@ { .vendor = "Eon", .name = "EN25B64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B64, .total_size = 8192, @@ -2891,7 +2891,7 @@ { .vendor = "Eon", .name = "EN25B64T", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25B64, .total_size = 8192, @@ -2924,7 +2924,7 @@ { .vendor = "Eon", .name = "EN25F05", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F05, .total_size = 64, @@ -2961,7 +2961,7 @@ { .vendor = "Eon", .name = "EN25F10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F10, .total_size = 128, @@ -2998,7 +2998,7 @@ { .vendor = "Eon", .name = "EN25F20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F20, .total_size = 256, @@ -3035,7 +3035,7 @@ { .vendor = "Eon", .name = "EN25F40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F40, .total_size = 512, @@ -3069,7 +3069,7 @@ { .vendor = "Eon", .name = "EN25F80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F80, .total_size = 1024, @@ -3103,7 +3103,7 @@ { .vendor = "Eon", .name = "EN25F16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F16, .total_size = 2048, @@ -3137,7 +3137,7 @@ { .vendor = "Eon", .name = "EN25F32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25F32, .total_size = 4096, @@ -3171,7 +3171,7 @@ { .vendor = "Eon", .name = "EN25Q40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q40, .total_size = 512, @@ -3206,7 +3206,7 @@ { .vendor = "Eon", .name = "EN25Q80(A)", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q80, .total_size = 1024, @@ -3243,7 +3243,7 @@ but has different write protection capabilities */ .vendor = "Eon", .name = "EN25Q16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q16, .total_size = 2048, @@ -3283,7 +3283,7 @@ { .vendor = "Eon", .name = "EN25Q32(A/B)", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q32, .total_size = 4096, @@ -3318,7 +3318,7 @@ { .vendor = "Eon", .name = "EN25Q64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q64, .total_size = 8192, @@ -3353,7 +3353,7 @@ { .vendor = "Eon", .name = "EN25Q128", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25Q128, .total_size = 16384, @@ -3387,7 +3387,7 @@ { .vendor = "Eon", .name = "EN25QH16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = EON_ID_NOPREFIX, .model_id = EON_EN25QH16, .total_size = 2048, @@ -3424,7 +3424,7 @@ { .vendor = "Eon", .name = "EN29F010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = EON_ID, .model_id = EON_EN29F010, .total_size = 128, @@ -3452,7 +3452,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, @@ -3484,7 +3484,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, @@ -3516,7 +3516,7 @@ { .vendor = "Fujitsu", .name = "MBM29F004BC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F004BC, .total_size = 512, @@ -3548,7 +3548,7 @@ { .vendor = "Fujitsu", .name = "MBM29F004TC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F004TC, .total_size = 512, @@ -3581,7 +3581,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, @@ -3613,7 +3613,7 @@ { .vendor = "Fujitsu", .name = "MBM29F400TC", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = FUJITSU_ID, .model_id = FUJITSU_MBM29F400TC, .total_size = 512, @@ -3645,7 +3645,7 @@ { .vendor = "Hyundai", .name = "HY29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F002T, .total_size = 256, @@ -3677,7 +3677,7 @@ { .vendor = "Hyundai", .name = "HY29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F002B, .total_size = 256, @@ -3709,7 +3709,7 @@ { .vendor = "Hyundai", .name = "HY29F040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = HYUNDAI_ID, .model_id = HYUNDAI_HY29F040A, .total_size = 512, @@ -3736,7 +3736,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, @@ -3763,7 +3763,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, @@ -3790,7 +3790,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, @@ -3817,7 +3817,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, @@ -3840,7 +3840,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, @@ -3867,7 +3867,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, @@ -3894,7 +3894,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, @@ -3922,7 +3922,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, @@ -3950,7 +3950,7 @@ { .vendor = "Intel", .name = "82802AB", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = INTEL_ID, .model_id = INTEL_82802AB, .total_size = 512, @@ -3975,7 +3975,7 @@ { .vendor = "Intel", .name = "82802AC", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = INTEL_ID, .model_id = INTEL_82802AC, .total_size = 1024, @@ -4000,7 +4000,7 @@ { .vendor = "Macronix", .name = "MX25L512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L512, .total_size = 64, @@ -4037,7 +4037,7 @@ { .vendor = "Macronix", .name = "MX25L1005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1005, .total_size = 128, @@ -4071,7 +4071,7 @@ { .vendor = "Macronix", .name = "MX25L2005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L2005, .total_size = 256, @@ -4108,7 +4108,7 @@ { .vendor = "Macronix", .name = "MX25L4005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L4005, .total_size = 512, @@ -4145,7 +4145,7 @@ { .vendor = "Macronix", .name = "MX25L8005", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L8005, .total_size = 1024, @@ -4182,7 +4182,7 @@ { .vendor = "Macronix", .name = "MX25L1605", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1605, .total_size = 2048, @@ -4219,7 +4219,7 @@ { .vendor = "Macronix", .name = "MX25L1635D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1635D, .total_size = 2048, @@ -4253,7 +4253,7 @@ { .vendor = "Macronix", .name = "MX25L1635E", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L1635E, .total_size = 2048, @@ -4287,7 +4287,7 @@ { .vendor = "Macronix", .name = "MX25L3205", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L3205, .total_size = 4096, @@ -4321,7 +4321,7 @@ { .vendor = "Macronix", .name = "MX25L3235D", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L3235D, .total_size = 4096, @@ -4355,7 +4355,7 @@ { .vendor = "Macronix", .name = "MX25L6405", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L6405, .total_size = 8192, @@ -4389,7 +4389,7 @@ { .vendor = "Macronix", .name = "MX25L12805", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L12805, .total_size = 16384, @@ -4423,7 +4423,7 @@ { .vendor = "Macronix", .name = "MX29F001B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F001B, .total_size = 128, @@ -4456,7 +4456,7 @@ { .vendor = "Macronix", .name = "MX29F001T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F001T, .total_size = 128, @@ -4489,7 +4489,7 @@ { .vendor = "Macronix", .name = "MX29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F002B, .total_size = 256, @@ -4521,7 +4521,7 @@ { .vendor = "Macronix", .name = "MX29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F002T, .total_size = 256, @@ -4553,7 +4553,7 @@ { .vendor = "Macronix", .name = "MX29F040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29F040, .total_size = 512, @@ -4580,7 +4580,7 @@ { .vendor = "Macronix", .name = "MX29LV040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX29LV040, .total_size = 512, @@ -4607,7 +4607,7 @@ { .vendor = "MoselVitelic", .name = "V29C51000B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51000B, .total_size = 64, @@ -4634,7 +4634,7 @@ { .vendor = "MoselVitelic", .name = "V29C51000T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51000T, .total_size = 64, @@ -4661,7 +4661,7 @@ { .vendor = "MoselVitelic", .name = "V29C51400B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51400B, .total_size = 512, @@ -4688,7 +4688,7 @@ { .vendor = "MoselVitelic", .name = "V29C51400T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29C51400T, .total_size = 512, @@ -4715,7 +4715,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51000", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51000, .total_size = 64, @@ -4742,7 +4742,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51001", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51001, .total_size = 128, @@ -4769,7 +4769,7 @@ { .vendor = "MoselVitelic", .name = "V29LC51002", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SYNCMOS_MVC_ID, .model_id = MVC_V29LC51002, .total_size = 256, @@ -4796,7 +4796,7 @@ { .vendor = "Numonyx", .name = "M25PE10", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE10, .total_size = 128, @@ -4826,7 +4826,7 @@ { .vendor = "Numonyx", .name = "M25PE20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE20, .total_size = 256, @@ -4856,7 +4856,7 @@ { .vendor = "Numonyx", .name = "M25PE40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE40, .total_size = 512, @@ -4886,7 +4886,7 @@ { .vendor = "Numonyx", .name = "M25PE80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE80, .total_size = 1024, @@ -4916,7 +4916,7 @@ { .vendor = "Numonyx", .name = "M25PE16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PE16, .total_size = 2048, @@ -4946,7 +4946,7 @@ { .vendor = "PMC", .name = "Pm25LV010", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV010, .total_size = 128, @@ -4976,7 +4976,7 @@ { .vendor = "PMC", .name = "Pm25LV016B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV016B, .total_size = 2048, @@ -5012,7 +5012,7 @@ { .vendor = "PMC", .name = "Pm25LV020", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV020, .total_size = 256, @@ -5042,7 +5042,7 @@ { .vendor = "PMC", .name = "Pm25LV040", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV040, .total_size = 512, @@ -5072,7 +5072,7 @@ { .vendor = "PMC", .name = "Pm25LV080B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV080B, .total_size = 1024, @@ -5108,7 +5108,7 @@ { .vendor = "PMC", .name = "Pm25LV512", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = PMC_ID, .model_id = PMC_PM25LV512, .total_size = 64, @@ -5138,7 +5138,7 @@ { .vendor = "PMC", .name = "Pm29F002T", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM29F002T, .total_size = 256, @@ -5170,7 +5170,7 @@ { .vendor = "PMC", .name = "Pm29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM29F002B, .total_size = 256, @@ -5202,7 +5202,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, @@ -5232,7 +5232,7 @@ { .vendor = "PMC", .name = "Pm39LV020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM39LV020, .total_size = 256, @@ -5262,7 +5262,7 @@ { .vendor = "PMC", .name = "Pm39LV040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = PMC_ID_NOPREFIX, .model_id = PMC_PM39LV040, .total_size = 512, @@ -5292,7 +5292,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, @@ -5323,7 +5323,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, @@ -5354,7 +5354,7 @@ { .vendor = "Sanyo", .name = "LF25FW203A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SANYO_ID, .model_id = SANYO_LE25FW203A, .total_size = 2048, @@ -5380,7 +5380,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, @@ -5413,7 +5413,7 @@ { .vendor = "Spansion", .name = "S25FL004A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL004A, .total_size = 512, @@ -5440,7 +5440,7 @@ { .vendor = "Spansion", .name = "S25FL008A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL008A, .total_size = 1024, @@ -5467,7 +5467,7 @@ { .vendor = "Spansion", .name = "S25FL016A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL016A, .total_size = 2048, @@ -5494,7 +5494,7 @@ { .vendor = "Spansion", .name = "S25FL032A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL032A, .total_size = 4096, @@ -5521,7 +5521,7 @@ { .vendor = "Spansion", .name = "S25FL064A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, .model_id = SPANSION_S25FL064A, .total_size = 8192, @@ -5548,7 +5548,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, @@ -5578,7 +5578,7 @@ { .vendor = "SST", .name = "SST25VF016B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF016B, .total_size = 2048, @@ -5614,7 +5614,7 @@ { .vendor = "SST", .name = "SST25VF032B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF032B, .total_size = 4096, @@ -5650,7 +5650,7 @@ { .vendor = "SST", .name = "SST25VF064C", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF064C, .total_size = 8192, @@ -5686,7 +5686,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, @@ -5716,7 +5716,7 @@ { .vendor = "SST", .name = "SST25VF040B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF040B, .total_size = 512, @@ -5752,7 +5752,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, @@ -5782,7 +5782,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, @@ -5818,7 +5818,7 @@ { .vendor = "SST", .name = "SST25VF080B", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = SST_ID, .model_id = SST_SST25VF080B, .total_size = 1024, @@ -5854,7 +5854,7 @@ { .vendor = "SST", .name = "SST28SF040A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST28SF040, .total_size = 512, @@ -5882,7 +5882,7 @@ { .vendor = "SST", .name = "SST29EE010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29EE010, .total_size = 128, @@ -5906,7 +5906,7 @@ { .vendor = "SST", .name = "SST29LE010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29LE010, .total_size = 128, @@ -5930,7 +5930,7 @@ { .vendor = "SST", .name = "SST29EE020A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29EE020A, .total_size = 256, @@ -5954,7 +5954,7 @@ { .vendor = "SST", .name = "SST29LE020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST29LE020, .total_size = 256, @@ -5978,7 +5978,7 @@ { .vendor = "SST", .name = "SST39SF512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF512, .total_size = 64, @@ -6005,7 +6005,7 @@ { .vendor = "SST", .name = "SST39SF010A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF010, .total_size = 128, @@ -6032,7 +6032,7 @@ { .vendor = "SST", .name = "SST39SF020A", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF020, .total_size = 256, @@ -6059,7 +6059,7 @@ { .vendor = "SST", .name = "SST39SF040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39SF040, .total_size = 512, @@ -6086,7 +6086,7 @@ { .vendor = "SST", .name = "SST39VF512", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF512, .total_size = 64, @@ -6113,7 +6113,7 @@ { .vendor = "SST", .name = "SST39VF010", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF010, .total_size = 128, @@ -6140,7 +6140,7 @@ { .vendor = "SST", .name = "SST39VF020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF020, .total_size = 256, @@ -6167,7 +6167,7 @@ { .vendor = "SST", .name = "SST39VF040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF040, .total_size = 512, @@ -6194,7 +6194,7 @@ { .vendor = "SST", .name = "SST39VF080", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = SST_ID, .model_id = SST_SST39VF080, .total_size = 1024, @@ -6224,7 +6224,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, @@ -6256,7 +6256,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, @@ -6291,7 +6291,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, @@ -6323,7 +6323,7 @@ { .vendor = "SST", .name = "SST49LF004C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF004C, .total_size = 512, @@ -6356,7 +6356,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, @@ -6388,7 +6388,7 @@ { .vendor = "SST", .name = "SST49LF008C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF008C, .total_size = 1024, @@ -6421,7 +6421,7 @@ { .vendor = "SST", .name = "SST49LF016C", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = SST_ID, .model_id = SST_SST49LF016C, .total_size = 2048, @@ -6454,7 +6454,7 @@ { .vendor = "SST", .name = "SST49LF020", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF020, .total_size = 256, @@ -6484,7 +6484,7 @@ { .vendor = "SST", .name = "SST49LF020A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF020A, .total_size = 256, @@ -6514,7 +6514,7 @@ { .vendor = "SST", .name = "SST49LF040", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF040, .total_size = 512, @@ -6544,7 +6544,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, @@ -6575,7 +6575,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, @@ -6605,7 +6605,7 @@ { .vendor = "SST", .name = "SST49LF160C", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = SST_ID, .model_id = SST_SST49LF160C, .total_size = 2048, @@ -6638,7 +6638,7 @@ { .vendor = "ST", .name = "M25P05-A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P05A, .total_size = 64, @@ -6670,7 +6670,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, @@ -6697,7 +6697,7 @@ { .vendor = "ST", .name = "M25P10-A", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P10A, .total_size = 128, @@ -6725,7 +6725,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, @@ -6752,7 +6752,7 @@ { .vendor = "ST", .name = "M25P20", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P20, .total_size = 256, @@ -6779,7 +6779,7 @@ { .vendor = "ST", .name = "M25P40", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P40, .total_size = 512, @@ -6806,7 +6806,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, @@ -6832,7 +6832,7 @@ { .vendor = "ST", .name = "M25P80", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P80, .total_size = 1024, @@ -6859,7 +6859,7 @@ { .vendor = "ST", .name = "M25P16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P16, .total_size = 2048, @@ -6886,7 +6886,7 @@ { .vendor = "ST", .name = "M25P32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P32, .total_size = 4096, @@ -6913,7 +6913,7 @@ { .vendor = "ST", .name = "M25P64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P64, .total_size = 8192, @@ -6940,7 +6940,7 @@ { .vendor = "ST", .name = "M25P128", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25P128, .total_size = 16384, @@ -6967,7 +6967,7 @@ { .vendor = "ST", .name = "M25PX16", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX16, .total_size = 2048, @@ -6996,7 +6996,7 @@ { .vendor = "ST", .name = "M25PX32", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX32, .total_size = 4096, @@ -7026,7 +7026,7 @@ { .vendor = "ST", .name = "M25PX64", - .bustype = CHIP_BUSTYPE_SPI, + .bustype = BUS_SPI, .manufacture_id = ST_ID, .model_id = ST_M25PX64, .total_size = 8192, @@ -7055,7 +7055,7 @@ { .vendor = "ST", .name = "M29F002B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F002B, .total_size = 256, @@ -7087,7 +7087,7 @@ { .vendor = "ST", .name = "M29F002T/NT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F002T, .total_size = 256, @@ -7119,7 +7119,7 @@ { .vendor = "ST", .name = "M29F040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29F040B, .total_size = 512, @@ -7147,7 +7147,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, @@ -7179,7 +7179,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, @@ -7211,7 +7211,7 @@ { .vendor = "ST", .name = "M29W010B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W010B, .total_size = 128, @@ -7238,7 +7238,7 @@ { .vendor = "ST", .name = "M29W040B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W040B, .total_size = 512, @@ -7265,7 +7265,7 @@ { .vendor = "ST", .name = "M29W512B", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = ST_ID, .model_id = ST_M29W512B, .total_size = 64, @@ -7289,7 +7289,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, @@ -7322,7 +7322,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, @@ -7355,7 +7355,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, @@ -7388,7 +7388,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, @@ -7421,7 +7421,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, @@ -7451,7 +7451,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, @@ -7476,7 +7476,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, @@ -7501,7 +7501,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, @@ -7526,7 +7526,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, @@ -7557,7 +7557,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, @@ -7584,7 +7584,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, @@ -7611,7 +7611,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, @@ -7637,7 +7637,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, @@ -7663,7 +7663,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, @@ -7690,7 +7690,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, @@ -7717,7 +7717,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, @@ -7744,7 +7744,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, @@ -7771,7 +7771,7 @@ { .vendor = "TI", .name = "TMS29F002RB", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = TI_OLD_ID, .model_id = TI_TMS29F002RB, .total_size = 256, @@ -7803,7 +7803,7 @@ { .vendor = "TI", .name = "TMS29F002RT", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = TI_OLD_ID, .model_id = TI_TMS29F002RT, .total_size = 256, @@ -7835,7 +7835,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, @@ -7872,7 +7872,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, @@ -7909,7 +7909,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, @@ -7946,7 +7946,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, @@ -7982,7 +7982,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, @@ -8018,7 +8018,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, @@ -8049,7 +8049,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, @@ -8080,7 +8080,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, @@ -8111,7 +8111,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, @@ -8142,7 +8142,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, @@ -8179,7 +8179,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, @@ -8216,7 +8216,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, @@ -8253,7 +8253,7 @@ { .vendor = "Winbond", .name = "W29C010(M)/W29C011A/W29EE011/W29EE012-old", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C010, .total_size = 128, @@ -8276,7 +8276,7 @@ {/* W29EE011, W29EE012, W29C010M, W29C011A do not support probe_jedec according to the datasheet, but it works for newer(?) steppings. */ .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, @@ -8299,7 +8299,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, @@ -8323,7 +8323,7 @@ { .vendor = "Winbond", .name = "W29C040/P", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W29C040, .total_size = 512, @@ -8347,7 +8347,7 @@ { .vendor = "Winbond", .name = "W39L040", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39L040, .total_size = 512, @@ -8378,7 +8378,7 @@ { .vendor = "Winbond", .name = "W39V040A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040A, .total_size = 512, @@ -8406,7 +8406,7 @@ { .vendor = "Winbond", .name = "W39V040B", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, .total_size = 512, @@ -8434,7 +8434,7 @@ { .vendor = "Winbond", .name = "W39V040C", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, .total_size = 512, @@ -8462,7 +8462,7 @@ { .vendor = "Winbond", .name = "W39V040FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040FA, .total_size = 512, @@ -8494,7 +8494,7 @@ { .vendor = "Winbond", .name = "W39V040FB", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, .total_size = 512, @@ -8523,7 +8523,7 @@ { .vendor = "Winbond", .name = "W39V040FC", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, .total_size = 512, @@ -8551,7 +8551,7 @@ { .vendor = "Winbond", .name = "W39V080A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V080A, .total_size = 1024, @@ -8579,7 +8579,7 @@ { .vendor = "Winbond", .name = "W49F002U/N", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49F002U, .total_size = 256, @@ -8611,7 +8611,7 @@ { .vendor = "Winbond", .name = "W49F020", - .bustype = CHIP_BUSTYPE_PARALLEL, + .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49F020, .total_size = 256, @@ -8635,7 +8635,7 @@ { .vendor = "Winbond", .name = "W49V002A", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = BUS_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49V002A, .total_size = 256, @@ -8667,7 +8667,7 @@ { .vendor = "Winbond", .name = "W49V002FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W49V002FA, .total_size = 256, @@ -8699,7 +8699,7 @@ { .vendor = "Winbond", .name = "W39V080FA", - .bustype = CHIP_BUSTYPE_FWH, + .bustype = BUS_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V080FA, .total_size = 1024, @@ -8728,7 +8728,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, @@ -8756,7 +8756,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, @@ -8771,7 +8771,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, @@ -8786,7 +8786,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, @@ -8801,7 +8801,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, @@ -8816,7 +8816,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, @@ -8831,7 +8831,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, @@ -8846,7 +8846,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, @@ -8861,7 +8861,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, @@ -8876,7 +8876,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, @@ -8888,7 +8888,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, Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/flashrom.c Wed Jul 27 09:13:06 2011 (r1396) @@ -505,7 +505,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. */ @@ -1080,7 +1080,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 " @@ -1089,7 +1089,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 " @@ -1097,7 +1097,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 " @@ -1105,7 +1105,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 " Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/gfxnvidia.c Wed Jul 27 09:13:06 2011 (r1396) @@ -94,7 +94,7 @@ reg32 &= ~(1 << 0); rpci_write_long(pcidev_dev, 0x50, reg32); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; /* Write/erase doesn't work. */ programmer_may_write = 0; Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/ichspi.c Wed Jul 27 09:13:06 2011 (r1396) @@ -1381,7 +1381,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)); Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/internal.c Wed Jul 27 09:13:06 2011 (r1396) @@ -190,7 +190,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 */ Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/it85spi.c Wed Jul 27 09:13:06 2011 (r1396) @@ -293,7 +293,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; } @@ -302,7 +302,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. */ Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/it87spi.c Wed Jul 27 09:13:06 2011 (r1396) @@ -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); Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/nic3com.c Wed Jul 27 09:13:06 2011 (r1396) @@ -96,7 +96,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; if (register_shutdown(nic3com_shutdown, NULL)) Modified: trunk/nicintel.c ============================================================================== --- trunk/nicintel.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/nicintel.c Wed Jul 27 09:13:06 2011 (r1396) @@ -93,7 +93,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; Modified: trunk/nicnatsemi.c ============================================================================== --- trunk/nicnatsemi.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/nicnatsemi.c Wed Jul 27 09:13:06 2011 (r1396) @@ -48,7 +48,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 Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/nicrealtek.c Wed Jul 27 09:13:06 2011 (r1396) @@ -50,7 +50,7 @@ io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); - buses_supported = CHIP_BUSTYPE_PARALLEL; + buses_supported = BUS_PARALLEL; if (register_shutdown(nicrealtek_shutdown, NULL)) return 1; Modified: trunk/print.c ============================================================================== --- trunk/print.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/print.c Wed Jul 27 09:13:06 2011 (r1396) @@ -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. */ Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/satamv.c Wed Jul 27 09:13:06 2011 (r1396) @@ -137,7 +137,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. */ Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/satasii.c Wed Jul 27 09:13:06 2011 (r1396) @@ -76,7 +76,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; if (register_shutdown(satasii_shutdown, NULL)) return 1; Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/serprog.c Wed Jul 27 09:13:06 2011 (r1396) @@ -462,7 +462,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; Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Tue Jul 26 22:48:54 2011 (r1395) +++ trunk/spi.c Wed Jul 27 09:13:06 2011 (r1396) @@ -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; }

1 0

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

27 Jul '11

Hello, Just to stay updated. Benjamin.

5 9

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

27 Jul '11

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

4 5

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom