From: Tom Rini Date: Fri, 19 Dec 2014 21:52:54 +0000 (-0500) Subject: am33xx: Drop timer_init call from s_init X-Git-Tag: v2015.01~53 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b352dde1ea715e8481946ec7d8086b3c3eb126ae;p=oweals%2Fu-boot.git am33xx: Drop timer_init call from s_init In both SPL and non-SPL cases we will make a call to timer_init() early on and do not need to call it again within s_init(). Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 29b1d73438..eaf09d1a62 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -294,7 +294,6 @@ void s_init(void) save_omap_boot_params(); #endif watchdog_disable(); - timer_init(); set_uart_mux_conf(); setup_clocks_for_console(); uart_soft_reset();