summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmx.de>2012-01-04 15:26:23 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-01-16 08:40:12 +0100
commit8775471bb378bbd04dca91153db96c33b30f76e7 (patch)
tree7f8ac0b887c07fdd31ce95fd6f85ea0e6f189bbb
parent0b620ec97e05ddb09714d127a7880333fc4008fb (diff)
downloadu-boot-imx-8775471bb378bbd04dca91153db96c33b30f76e7.zip
u-boot-imx-8775471bb378bbd04dca91153db96c33b30f76e7.tar.gz
u-boot-imx-8775471bb378bbd04dca91153db96c33b30f76e7.tar.bz2
OMAP SPL: call timer_init in s_init to make udelay work earlier
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
-rw-r--r--arch/arm/cpu/armv7/omap-common/spl.c2
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 9c35a09..74fea4f 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 1f33c63..871aa37 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)