From: Jean-Jacques Hiblot <jjhiblot@ti.com>
Date: Fri, 15 Sep 2017 10:57:33 +0000 (+0200)
Subject: omap: detect board before spl_early_init()
X-Git-Tag: v2017.11-rc2~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a4d72869f83a7f31a2f0bd000cea86980ddb975f;p=oweals%2Fu-boot.git

omap: detect board before spl_early_init()

In order to be able to select the right DTB, we need to have identified the
board before spl_early_init() is called.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 7324d522ee..56890a0c54 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -165,9 +165,11 @@ void early_system_init(void)
 	 * to prevent overwrites.
 	 */
 	save_omap_boot_params();
-	spl_early_init();
 #endif
 	do_board_detect();
+#ifdef CONFIG_SPL_BUILD
+	spl_early_init();
+#endif
 	vcores_init();
 #ifdef CONFIG_DEBUG_UART_OMAP
 	debug_uart_init();