Moves the early UART clock setup setup_clocks_for_console() from preloader_console_init() to s_init() of OMAP4.
Signed-off-by: Simon Schwarz simonschwarzcor@gmail.com --- arch/arm/cpu/armv7/omap-common/spl.c | 1 - arch/arm/cpu/armv7/omap4/board.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index d177652..d380b3e 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -259,7 +259,6 @@ void preloader_console_init(void) gd->flags |= GD_FLG_RELOC; gd->baudrate = CONFIG_BAUDRATE;
- setup_clocks_for_console(); serial_init(); /* serial communications setup */
/* Avoid a second "U-Boot" coming from this string */ diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index 5943d61..a9e90de 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -196,6 +196,7 @@ void s_init(void) watchdog_init(); set_mux_conf_regs(); #ifdef CONFIG_SPL_BUILD + setup_clocks_for_console(); preloader_console_init(); #endif prcm_init();