summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--atahpt.c2
-rw-r--r--board_enable.c2
-rw-r--r--chipset_enable.c24
-rw-r--r--drkaiser.c2
-rw-r--r--dummyflasher.c10
-rw-r--r--flash.h14
-rw-r--r--flashchips.c590
-rw-r--r--flashrom.c10
-rw-r--r--gfxnvidia.c2
-rw-r--r--ichspi.c2
-rw-r--r--internal.c2
-rw-r--r--it85spi.c4
-rw-r--r--it87spi.c2
-rw-r--r--nic3com.c2
-rw-r--r--nicintel.c2
-rw-r--r--nicnatsemi.c2
-rw-r--r--nicrealtek.c2
-rw-r--r--print.c14
-rw-r--r--satamv.c2
-rw-r--r--satasii.c2
-rw-r--r--serprog.c2
-rw-r--r--spi.c2
22 files changed, 348 insertions, 348 deletions
diff --git a/atahpt.c b/atahpt.c
index de888b0c6..3451342ed 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -61,7 +61,7 @@ int atahpt_init(void)
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;
diff --git a/board_enable.c b/board_enable.c
index 35fdf0792..107ca0c6a 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -425,7 +425,7 @@ int it8705f_write_enable(uint8_t port)
/* 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");
diff --git a/chipset_enable.c b/chipset_enable.c
index 21990f692..0f854c800 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -210,7 +210,7 @@ static int enable_flash_piix4(struct pci_dev *dev, const char *name)
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 @@ static int enable_flash_ich_4e(struct pci_dev *dev, const char *name)
* 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 @@ idsel_garbage_out:
/* 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 @@ static int enable_flash_poulsbo(struct pci_dev *dev, const char *name)
if (new != old)
rpci_write_byte(dev, 0xd9, new);
- buses_supported = CHIP_BUSTYPE_FWH;
+ buses_supported = BUS_FWH;
return 0;
}
@@ -487,7 +487,7 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
* 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 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
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 @@ static int enable_flash_cs5530(struct pci_dev *dev, const char *name)
#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 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
(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 @@ static int enable_flash_osb4(struct pci_dev *dev, const char *name)
{
uint8_t tmp;
- buses_supported = CHIP_BUSTYPE_PARALLEL;
+ buses_supported = BUS_PARALLEL;
tmp = INB(0xc06);
tmp |= 0x1;
@@ -922,7 +922,7 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name)
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 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name)
/* 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 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name)
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;
diff --git a/drkaiser.c b/drkaiser.c
index db4be60ac..be8e5cb52 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -64,7 +64,7 @@ int drkaiser_init(void)
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;
diff --git a/dummyflasher.c b/dummyflasher.c
index fca228cfb..4d0b42ec9 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -107,24 +107,24 @@ int dummy_init(void)
/* 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);
diff --git a/flash.h b/flash.h
index 9c6d53551..5b49e9d5d 100644
--- a/flash.h
+++ b/flash.h
@@ -57,13 +57,13 @@ void programmer_delay(int usecs);
#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,
};
/*
diff --git a/flashchips.c b/flashchips.c
index 42dd38a58..a040e8c8a 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -60,7 +60,7 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
/*{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
/* 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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
*/
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
/* 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 @@ const struct flashchip flashchips[] = {
/* 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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{/* 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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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 @@ const struct flashchip flashchips[] = {
{
.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,
diff --git a/flashrom.c b/flashrom.c
index 7b1b9ba73..0a1d8124d 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -505,7 +505,7 @@ int programmer_init(char *param)
.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 generate_testpattern(uint8_t *buf, uint32_t size, int variant)
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 @@ int check_max_decode(enum chipbustype buses, uint32_t size)
"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 @@ int check_max_decode(enum chipbustype buses, uint32_t size)
"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 @@ int check_max_decode(enum chipbustype buses, uint32_t size)
"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 "
diff --git a/gfxnvidia.c b/gfxnvidia.c
index 3f67c72ea..5bf4d4e15 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -94,7 +94,7 @@ int gfxnvidia_init(void)
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;
diff --git a/ichspi.c b/ichspi.c
index 02586266a..833c0c39c 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -1381,7 +1381,7 @@ int via_init_spi(struct pci_dev *dev)
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));
diff --git a/internal.c b/internal.c
index 393842854..846cf1e94 100644
--- a/internal.c
+++ b/internal.c
@@ -190,7 +190,7 @@ int internal_init(void)
/* 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 */
diff --git a/it85spi.c b/it85spi.c
index d4ca13b0f..0107c9be4 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -293,7 +293,7 @@ int it85xx_spi_init(struct superio s)
{
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 @@ int it85xx_spi_init(struct superio s)
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. */
diff --git a/it87spi.c b/it87spi.c
index 54f41fae3..9ed71dcb8 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -193,7 +193,7 @@ static uint16_t it87spi_probe(uint16_t port)
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);
diff --git a/nic3com.c b/nic3com.c
index bcc63e0bd..d8a11d060 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -96,7 +96,7 @@ int nic3com_init(void)
*/
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))
diff --git a/nicintel.c b/nicintel.c
index 2e6e46a24..54105231e 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -93,7 +93,7 @@ int nicintel_init(void)
*/
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;
diff --git a/nicnatsemi.c b/nicnatsemi.c
index ac37cf0cd..b89b5c576 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -48,7 +48,7 @@ int nicnatsemi_init(void)
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
diff --git a/nicrealtek.c b/nicrealtek.c
index 4566e50c6..bed071052 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -50,7 +50,7 @@ int nicrealtek_init(void)
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;
diff --git a/print.c b/print.c
index 16b79735f..b72aea8d8 100644
--- a/print.c
+++ b/print.c
@@ -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. */
diff --git a/satamv.c b/satamv.c
index c057a2e81..5c15fc8e4 100644
--- a/satamv.c
+++ b/satamv.c
@@ -137,7 +137,7 @@ int satamv_init(void)
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. */
diff --git a/satasii.c b/satasii.c
index dbc4f4f51..64f1dcb58 100644
--- a/satasii.c
+++ b/satasii.c
@@ -76,7 +76,7 @@ int satasii_init(void)
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;
diff --git a/serprog.c b/serprog.c
index e8a44024d..3adb958d4 100644
--- a/serprog.c
+++ b/serprog.c
@@ -462,7 +462,7 @@ int serprog_init(void)
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;
diff --git a/spi.c b/spi.c
index 5d2e441bc..f02f091de 100644
--- a/spi.c
+++ b/spi.c
@@ -195,5 +195,5 @@ uint32_t spi_get_valid_read_addr(void)
void register_spi_programmer(const struct spi_programmer *pgm)
{
spi_programmer = pgm;
- buses_supported |= CHIP_BUSTYPE_SPI;
+ buses_supported |= BUS_SPI;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 13:31:54 +0000