at91rm9200: fix lowlevel_init() SMRDATA size

[u-boot] / board / iphase4539 / iphase4539.c

diff --git a/board/iphase4539/iphase4539.c b/board/iphase4539/iphase4539.c
index e50250e4567799db43b8579781e25f31036a7f80..7fec2cc792029e4be8bf6da2c1b0a87392cdd2bd 100644 (file)
--- a/board/iphase4539/iphase4539.c
+++ b/board/iphase4539/iphase4539.c
@@ -193,18 +193,18 @@ const iop_conf_t iop_conf_tab[4][32] = {
         }
 };
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
        volatile uchar *base;
        ulong maxsize;
        int i;
 
-       memctl->memc_psrt = CFG_PSRT;
-       memctl->memc_mptpr = CFG_MPTPR;
+       memctl->memc_psrt = CONFIG_SYS_PSRT;
+       memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 
-#ifndef CFG_RAMBOOT
+#ifndef CONFIG_SYS_RAMBOOT
        immap->im_siu_conf.sc_ppc_acr = 0x00000026;
        immap->im_siu_conf.sc_ppc_alrh = 0x01276345;
        immap->im_siu_conf.sc_ppc_alrl = 0x89ABCDEF;
@@ -217,7 +217,7 @@ long int initdram (int board_type)
        /* Init Main SDRAM */
 #define OP_VALUE   0x404A241A
 #define OP_VALUE_M (OP_VALUE & 0x87FFFFFF);
-       base = (uchar *) CFG_SDRAM_BASE;
+       base = (uchar *) CONFIG_SYS_SDRAM_BASE;
        memctl->memc_psdmr = 0x28000000 | OP_VALUE_M;
        *base = 0xFF;
        memctl->memc_psdmr = 0x08000000 | OP_VALUE_M;
@@ -342,7 +342,7 @@ int hwc_serial_number (void)
 {
        int sn = -1;
 
-       if (!seeprom_read (0xa0, (char *) &sn, sizeof (sn))) {
+       if (!seeprom_read (0xa0, (uchar *) &sn, sizeof (sn))) {
                sn = cpu_to_le32 (sn);
        }
        return sn;
@@ -351,7 +351,7 @@ int hwc_mac_address (char *str)
 {
        char mac[6];
 
-       if (!seeprom_read (0xb0, mac, sizeof (mac))) {
+       if (!seeprom_read (0xb0, (uchar *)mac, sizeof (mac))) {
                sprintf (str, "%02x:%02x:%02x:%02x:%02x:%02x\n",
                                 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
        } else {