exynos: Remove unneeded device tree control #ifdefs
authorSimon Glass <sjg@chromium.org>
Fri, 3 Jul 2015 00:16:23 +0000 (18:16 -0600)
committerSimon Glass <sjg@chromium.org>
Thu, 6 Aug 2015 03:06:15 +0000 (21:06 -0600)
Since device tree is used for all exynos5 boards, we can remove the #ifdef
and reduce confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
board/samsung/common/board.c

index 1a4e8c9c99a1d6520cb824052cd19f004ccc0760..d32c75de50858f131284e28db0c7ed55883f1cb0 100644 (file)
@@ -152,13 +152,14 @@ int board_early_init_f(void)
        board_i2c_init(gd->fdt_blob);
 #endif
 
-#if defined(CONFIG_OF_CONTROL) && 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
- * FB 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.
- */
+#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");
@@ -179,7 +180,6 @@ int power_init_board(void)
 }
 #endif
 
-#ifdef CONFIG_OF_CONTROL
 #ifdef CONFIG_SMC911X
 static int decode_sromc(const void *blob, struct fdt_sromc *config)
 {
@@ -310,7 +310,6 @@ int checkboard(void)
        return 0;
 }
 #endif
-#endif /* CONFIG_OF_CONTROL */
 
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)