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

[u-boot] / board / samsung / goni / goni.c

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 43367291132f4b86c96e9160fa13e489b7e5d32a..581935d0547689d623e0ec3ff5e78f4bc31e82c3 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -42,6 +42,14 @@ int board_init(void)
 }
 
 int dram_init(void)
+{
+       gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE +
+                       PHYS_SDRAM_3_SIZE;
+
+       return 0;
+}
+
+void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
@@ -49,8 +57,6 @@ int dram_init(void)
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
        gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
        gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
-
-       return 0;
 }
 
 #ifdef CONFIG_DISPLAY_BOARDINFO
@@ -87,6 +93,6 @@ int board_mmc_init(bd_t *bis)
                gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
        }
 
-       return s5p_mmc_init(0);
+       return s5p_mmc_init(0, 4);
 }
 #endif