board_f: Drop setup_dram_config() wrapper

[oweals/u-boot.git] / board / samsung / common / board.c

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 799517428db70fe2bda29b08f8ab1e5330785067..49e4db2de95080779619e2782c7ce6c0b9df9a5f 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -108,7 +108,7 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        unsigned int i;
        unsigned long addr, size;
@@ -120,6 +120,8 @@ void dram_init_banksize(void)
                gd->bd->bi_dram[i].start = addr;
                gd->bd->bi_dram[i].size = size;
        }
+
+       return 0;
 }
 
 static int board_uart_init(void)
@@ -158,21 +160,6 @@ int board_early_init_f(void)
        board_i2c_init(gd->fdt_blob);
 #endif
 
-#if defined(CONFIG_EXYNOS_FB)
-       /*
-        * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
-        * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix,
-        * to reserve frame-buffer memory at a very early stage. So, we need
-        * to fill panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix
-        * before lcd_setmem() is called.
-        */
-       err = exynos_lcd_early_init(gd->fdt_blob);
-       if (err) {
-               debug("LCD early init failed\n");
-               return err;
-       }
-#endif
-
        return exynos_early_init_f();
 }
 #endif
@@ -266,7 +253,7 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_GENERIC_MMC
 static int init_mmc(void)
 {
-#ifdef CONFIG_SDHCI
+#ifdef CONFIG_MMC_SDHCI
        return exynos_mmc_init(gd->fdt_blob);
 #else
        return 0;
@@ -275,7 +262,7 @@ static int init_mmc(void)
 
 static int init_dwmmc(void)
 {
-#ifdef CONFIG_DWMMC
+#ifdef CONFIG_MMC_DW
        return exynos_dwmmc_init(gd->fdt_blob);
 #else
        return 0;