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

[u-boot] / board / westel / amx860 / amx860.c

diff --git a/board/westel/amx860/amx860.c b/board/westel/amx860/amx860.c
index 8826667cdc7d20e42265e915effd825788c76352..91dcc0dcb301e729f25ca71aa7d0b353826ad947 100644 (file)
--- a/board/westel/amx860/amx860.c
+++ b/board/westel/amx860/amx860.c
@@ -61,10 +61,10 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-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;
 
        /* AMX860: has 4 Mb of 60ns EDO DRAM, so start DRAM at 0 */