mx53evk: Place machine ID into board config

[u-boot] / board / cpc45 / pd67290.c

diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index d8f4be516d134dbd2e2a03e8b539cbbb9d60bdf1..0d8ef2336845fc843ce50898c370ef393aa93e4e 100644 (file)
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -639,7 +639,7 @@ static int i365_set_io_map (socket_info_t * s, struct pccard_io_map *io)
 #define        HOST_TO_PCI(addr)       ((addr) - 0xfe000000)
 #define        PCI_TO_HOST(addr)       ((addr) + 0xfe000000)
 
-int i82365_init (void)
+static int i82365_init (void)
 {
        u_int val;
        int i;
@@ -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);
 
@@ -719,7 +719,7 @@ int i82365_init (void)
        return 0;
 }
 
-void i82365_exit (void)
+static void i82365_exit (void)
 {
        io.map = 0;
        io.flags = 0;
@@ -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);