imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / cpc45 / pd67290.c

diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index 6ca3e7bd7ab62b69574229aad08de99f8ad73c97..12c9c746c5bc9a08c96fae3a7ff3fb5c0bec2eb7 100755 (executable)
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -699,16 +699,16 @@ int i82365_init (void)
        mem.map = 0;
        mem.flags = MAP_ATTRIB | MAP_ACTIVE;
        mem.speed = 300;
-       mem.sys_start = CFG_PCMCIA_MEM_ADDR;
-       mem.sys_stop = CFG_PCMCIA_MEM_ADDR + CFG_PCMCIA_MEM_SIZE - 1;
+       mem.sys_start = CONFIG_SYS_PCMCIA_MEM_ADDR;
+       mem.sys_stop = CONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS_PCMCIA_MEM_SIZE - 1;
        mem.card_start = 0;
        i365_set_mem_map (&socket, &mem);
 
        mem.map = 1;
        mem.flags = MAP_ACTIVE;
        mem.speed = 300;
-       mem.sys_start = CFG_PCMCIA_MEM_ADDR + CFG_PCMCIA_MEM_SIZE;
-       mem.sys_stop = CFG_PCMCIA_MEM_ADDR + (2 * CFG_PCMCIA_MEM_SIZE) - 1;
+       mem.sys_start = CONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS_PCMCIA_MEM_SIZE;
+       mem.sys_stop = CONFIG_SYS_PCMCIA_MEM_ADDR + (2 * CONFIG_SYS_PCMCIA_MEM_SIZE) - 1;
        mem.card_start = 0;
        i365_set_mem_map (&socket, &mem);
 
@@ -772,7 +772,7 @@ exit:
        return rc;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 int pcmcia_off (void)
 {
        printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n");
@@ -794,8 +794,8 @@ static void i82365_dump_regions (pci_dev_t dev)
 {
        u_int tmp[2];
        u_int *mem = (void *) socket.cb_phys;
-       u_char *cis = (void *) CFG_PCMCIA_MEM_ADDR;
-       u_char *ide = (void *) (CFG_ATA_BASE_ADDR + CFG_ATA_REG_OFFSET);
+       u_char *cis = (void *) CONFIG_SYS_PCMCIA_MEM_ADDR;
+       u_char *ide = (void *) (CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_REG_OFFSET);
 
        pci_read_config_dword (dev, 0x00, tmp + 0);
        pci_read_config_dword (dev, 0x80, tmp + 1);