aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean-Jacques Hiblot <jjhiblot@ti.com>2017-09-15 12:57:33 +0200
committerTom Rini <trini@konsulko.com>2017-10-06 11:27:40 -0400
commita4d72869f83a7f31a2f0bd000cea86980ddb975f (patch)
tree0d56fd2a6e888bd7509c3459d65a8a3400945ae9 /arch
parent2f57c95100f231de0f4e0301237cbe477e09084b (diff)
downloadu-boot-a4d72869f83a7f31a2f0bd000cea86980ddb975f.zip
u-boot-a4d72869f83a7f31a2f0bd000cea86980ddb975f.tar.gz
u-boot-a4d72869f83a7f31a2f0bd000cea86980ddb975f.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/hwinit-common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 7324d52..56890a0 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();