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

[oweals/u-boot.git] / board / emk / top860 / top860.c

diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c
index 931c0d1b675f841b38f4e28631788294906d77d9..76f7a0c5f9c84e0769cbee59a1f16f757ef7cc9e 100644 (file)
--- a/board/emk/top860/top860.c
+++ b/board/emk/top860/top860.c
@@ -76,9 +76,9 @@ int checkboard (void)
 /*****************************************************************************
  * Initialize DRAM controller
  *****************************************************************************/
-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 memctl8xx_t *memctl = &immap->im_memctl;
 
        /*
@@ -93,8 +93,8 @@ long int initdram (int board_type)
                           sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
                memctl->memc_mptpr = 0x0200;
                memctl->memc_mamr = 0x0ca20330;
-               memctl->memc_or2 = -CFG_DRAM_MAX | OR_CSNT_SAM;
-               memctl->memc_br2 = CFG_DRAM_BASE | BR_MS_UPMA | BR_V;
+               memctl->memc_or2 = -CONFIG_SYS_DRAM_MAX | OR_CSNT_SAM;
+               memctl->memc_br2 = CONFIG_SYS_DRAM_BASE | BR_MS_UPMA | BR_V;
                /*
                 * Do 8 read accesses to DRAM
                 */
@@ -112,7 +112,7 @@ long int initdram (int board_type)
                addr2[1] = 0x47110815;
                if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
                        /* only 4MB populated */
-                       memctl->memc_or2 = -(CFG_DRAM_MAX / 4) | OR_CSNT_SAM;
+                       memctl->memc_or2 = -(CONFIG_SYS_DRAM_MAX / 4) | OR_CSNT_SAM;
                }
        }
 
@@ -145,4 +145,3 @@ int misc_init_r (void)
 
        return (0);
 }
-