Merge git://git.denx.de/u-boot-dm

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

diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
index ab94c654994c938e84a2d4f665dbae4ec884bd22..133db8c6bdc46ffe94dfa9d8c5de6cf8fa2c1d3d 100644 (file)
--- a/board/ipek01/ipek01.c
+++ b/board/ipek01/ipek01.c
@@ -75,12 +75,12 @@ static void sdram_start (int hi_addr)
 }
 
 /*
- * ATTENTION: Although partially referenced initdram does NOT make real
+ * ATTENTION: Although partially referenced dram_init does NOT make real
  *           use of CONFIG_SYS_SDRAM_BASE. The code does not work if
  *           CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
  */
 
-phys_size_t initdram(void)
+int dram_init(void)
 {
        struct mpc5xxx_mmap_ctl *mmap_ctl =
                (struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR;
@@ -135,7 +135,9 @@ phys_size_t initdram(void)
         */
        out_be32 (&sdram->sdelay, 0x04);
 
-       return dramsize + dramsize2;
+       gd->ram_size = dramsize + dramsize2;
+
+       return 0;
 }
 
 int checkboard (void)