p1022ds: use weak CFI flash accessors when DIU is enabled

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

diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c
index 26adb4abb1fbed93fc65acd97747a4a823be1813..a62214cf597a2964a3d2cae3d5158ad49f2ad46d 100644 (file)
--- a/board/cobra5272/cobra5272.c
+++ b/board/cobra5272/cobra5272.c
@@ -22,8 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/m5272.h>
-#include <asm/immap_5272.h>
+#include <asm/immap.h>
 
 
 int checkboard (void)
@@ -33,9 +32,9 @@ int checkboard (void)
        return 0;
 };
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
-       volatile sdramctrl_t *sdp = (sdramctrl_t *) (CFG_MBAR + MCFSIM_SDCR);
+       volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM);
 
        sdp->sdram_sdtr = 0xf539;
        sdp->sdram_sdcr = 0x4211;
@@ -43,7 +42,7 @@ long int initdram (int board_type)
        /* Dummy write to start SDRAM */
        *((volatile unsigned long *) 0) = 0;
 
-       return CFG_SDRAM_SIZE * 1024 * 1024;
+       return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
 };
 
 int testdram (void)