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 --- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 2 ++ 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();