From: Andreas Müller <schnitzeltony@gmx.de>
Date: Wed, 4 Jan 2012 15:26:23 +0000 (+0000)
Subject: OMAP SPL: call timer_init in s_init to make udelay work earlier
X-Git-Tag: v2012.04-rc1~262
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8775471bb;p=u-boot

OMAP SPL: call timer_init in s_init to make udelay work earlier

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 9c35a09038..74fea4fa50 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -115,8 +115,6 @@ void board_init_r(gd_t *id, ulong dummy)
 	mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
 			CONFIG_SYS_SPL_MALLOC_SIZE);
 
-	timer_init();
-
 #ifdef CONFIG_SPL_BOARD_INIT
 	spl_board_init();
 #endif
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1f33c6398c..871aa37df8 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -230,6 +230,8 @@ void s_init(void)
 
 #ifdef CONFIG_SPL_BUILD
 	preloader_console_init();
+
+	timer_init();
 #endif
 
 	if (!in_sdram)