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

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

diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index c56c269daecc0418412354ec978b4b2967cbe347..0e3b84c61348f047882d7b6971dc8129696c868e 100644 (file)
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c
@@ -31,6 +31,7 @@
 #include <watchdog.h>
 
 unsigned long get_dram_size (void);
+void sdram_init(void);
 
 /*
  * Macros to transform values
@@ -151,8 +152,15 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
+       /*
+        * ToDo: Move the asm init routine sdram_init() to this C file,
+        * or even better use some common ppc4xx code available
+        * in cpu/ppc4xx
+        */
+       sdram_init();
+
        return get_dram_size ();
 }