diff options
Diffstat (limited to 'board/esd/dasa_sim')
| -rw-r--r-- | board/esd/dasa_sim/cmd_dasa_sim.c | 14 | ||||
| -rw-r--r-- | board/esd/dasa_sim/flash.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c index 89a4aaf80..36dd58c3e 100644 --- a/board/esd/dasa_sim/cmd_dasa_sim.c +++ b/board/esd/dasa_sim/cmd_dasa_sim.c @@ -48,13 +48,13 @@ static unsigned int PciEepromReadLongVPD (int offs) unsigned int ret; int count; - pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c, + pci_write_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x4c, (offs << 16) | 0x0003); count = 0; for (;;) { udelay (10 * 1000); - pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret); + pci_read_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x4c, &ret); if ((ret & 0x80000000) != 0) { break; } else { @@ -66,7 +66,7 @@ static unsigned int PciEepromReadLongVPD (int offs) } } - pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x50, &value); + pci_read_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x50, &value); return value; } @@ -77,14 +77,14 @@ static int PciEepromWriteLongVPD (int offs, unsigned int value) unsigned int ret; int count; - pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x50, value); - pci_write_config_dword (CFG_PCI9054_DEV_FN, 0x4c, + pci_write_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x50, value); + pci_write_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x4c, (offs << 16) | 0x80000003); count = 0; for (;;) { udelay (10 * 1000); - pci_read_config_dword (CFG_PCI9054_DEV_FN, 0x4c, &ret); + pci_read_config_dword (CONFIG_SYS_PCI9054_DEV_FN, 0x4c, &ret); if ((ret & 0x80000000) == 0) { break; } else { @@ -109,7 +109,7 @@ static void showPci9054 (void) for (l = 0; l < 6; l++) { printf ("%02x: ", l * 0x10); for (i = 0; i < 4; i++) { - pci_read_config_dword (CFG_PCI9054_DEV_FN, + pci_read_config_dword (CONFIG_SYS_PCI9054_DEV_FN, l * 16 + i * 4, (unsigned int *)&val); printf ("%08x ", val); diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c index d2ac13fcd..9c71b043c 100644 --- a/board/esd/dasa_sim/flash.c +++ b/board/esd/dasa_sim/flash.c @@ -47,7 +47,7 @@ unsigned long flash_init (void) unsigned long base_b0; /* Init: no FLASHes known */ - for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) { + for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) { flash_info[i].flash_id = FLASH_UNKNOWN; } |