Merge branch 'master' of git://git.denx.de/u-boot-imx

[people/ms/u-boot.git] / board / atc / ti113x.c

diff --git a/board/atc/ti113x.c b/board/atc/ti113x.c
index d5e935c400a7bcddfa92ccac430e605a21e3770d..ff871f64f972a2c59b892634848028f482392d49 100644 (file)
--- a/board/atc/ti113x.c
+++ b/board/atc/ti113x.c
@@ -468,7 +468,7 @@ static int i365_set_io_map (socket_info_t * s, struct pccard_io_map *io)
 
 /*====================================================================*/
 
-int i82365_init (void)
+static int i82365_init (void)
 {
        u_int val;
        int i;
@@ -526,8 +526,8 @@ 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);
 
@@ -545,7 +545,7 @@ int i82365_init (void)
        return 0;
 }
 
-void i82365_exit (void)
+static void i82365_exit (void)
 {
        io.map = 0;
        io.flags = 0;
@@ -591,7 +591,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");
@@ -613,8 +613,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);