summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-07-02 18:16:23 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 21:06:15 -0600
commitbae34335e8aef46d7103907580c40f18f1876bb0 (patch)
tree6726484d0024aa990c1c3f8a9647b4d1bcad368e
parentd4061aa0e9bb48e55a958b59950e314c1c03f124 (diff)
downloadu-boot-imx-bae34335e8aef46d7103907580c40f18f1876bb0.zip
u-boot-imx-bae34335e8aef46d7103907580c40f18f1876bb0.tar.gz
u-boot-imx-bae34335e8aef46d7103907580c40f18f1876bb0.tar.bz2
exynos: Remove unneeded device tree control #ifdefs
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>
-rw-r--r--board/samsung/common/board.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 1a4e8c9..d32c75d 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -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)