summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorDechesne, Nicolas <n-dechesne@ti.com>2012-01-31 07:35:40 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-12 10:11:23 +0100
commitf59021791b5a09b22c886aa6c1115cd49b730d6c (patch)
tree4ce061ab70b7c4888233bf21ac282ec9a6289a13 /arch/arm
parent8167af14d58b32fe50a9a3a1bdc44b45e101f93f (diff)
downloadu-boot-imx-f59021791b5a09b22c886aa6c1115cd49b730d6c.zip
u-boot-imx-f59021791b5a09b22c886aa6c1115cd49b730d6c.tar.gz
u-boot-imx-f59021791b5a09b22c886aa6c1115cd49b730d6c.tar.bz2
OMAP SPL: Fix missing timer_init() call in OMAP4 s_init()
In 8775471bb, the call to timer_init() was removed from common code and put in OMAP3 s_init() function. As a result the boot was broken on OMAP4. This patch adds timer_init() in OMAP4 s_init(), that fix boot on all OMAP4 boards. Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com> Tested-by: Robert P. J. Day <rpjday@crashcourse.ca> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/omap-common/hwinit-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 49cdc39..ab46bff 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -120,6 +120,8 @@ void s_init(void)
#endif
prcm_init();
#ifdef CONFIG_SPL_BUILD
+ timer_init();
+
/* For regular u-boot sdram_init() is called from dram_init() */
sdram_init();
init_boot_params();