X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fv37%2Fv37.c;h=9c7bad52f3dd5d07d8346f313868a22d5fbfdaa6;hb=588a13f742b6d63ac7d5631af11baa01f3a9e80f;hp=2e4757302410d2c2125a7069d70a5c544560ffbc;hpb=eddc7c46c6030d6eca29ac254c9db98198be572d;p=u-boot

diff --git a/board/v37/v37.c b/board/v37/v37.c
index 2e47573024..9c7bad52f3 100644
--- a/board/v37/v37.c
+++ b/board/v37/v37.c
@@ -90,9 +90,9 @@ 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;
     unsigned long temp;
     volatile int delay_cnt;
@@ -136,8 +136,8 @@ long int initdram (int board_type)
 
 #ifdef	CONFIG_CAN_DRIVER
     /* Initialize OR3 / BR3 */
-    memctl->memc_or3 = CFG_OR3_CAN;
-    memctl->memc_br3 = CFG_BR3_CAN;
+    memctl->memc_or3 = CONFIG_SYS_OR3_CAN;
+    memctl->memc_br3 = CONFIG_SYS_BR3_CAN;
 
     /* Initialize MBMR */
     memctl->memc_mamr = MAMR_GPL_A4DIS;	/* GPL_A4 ouput line Disable */
@@ -191,7 +191,7 @@ long int initdram (int board_type)
 
 static long int dram_size ()
 {
-    volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
+    volatile immap_t     *immap  = (immap_t *)CONFIG_SYS_IMMR;
     volatile sysconf8xx_t *siu = &immap->im_siu_conf;
     volatile pcmconf8xx_t *pcm = &immap->im_pcmcia;
     long int		  i, memory=1;