omap-common/omap4: relocate early UART clock setup
Moves the early UART clock setup setup_clocks_for_console() from preloader_console_init() to s_init() of OMAP4. This is done to prepare for OMAP3 integration. This patch was posted seperatly to the mailinglist but I decidet - since it is a prereqesit for this patch to add it. Former port to ML: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/104395 Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com> Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
parent
cdbc2773c2
commit
63ffcfcbd0
|
@ -249,6 +249,7 @@ void board_init_r(gd_t *id, ulong dummy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This requires UART clocks to be enabled */
|
||||||
void preloader_console_init(void)
|
void preloader_console_init(void)
|
||||||
{
|
{
|
||||||
const char *u_boot_rev = U_BOOT_VERSION;
|
const char *u_boot_rev = U_BOOT_VERSION;
|
||||||
|
@ -259,7 +260,6 @@ void preloader_console_init(void)
|
||||||
gd->flags |= GD_FLG_RELOC;
|
gd->flags |= GD_FLG_RELOC;
|
||||||
gd->baudrate = CONFIG_BAUDRATE;
|
gd->baudrate = CONFIG_BAUDRATE;
|
||||||
|
|
||||||
setup_clocks_for_console();
|
|
||||||
serial_init(); /* serial communications setup */
|
serial_init(); /* serial communications setup */
|
||||||
|
|
||||||
/* Avoid a second "U-Boot" coming from this string */
|
/* Avoid a second "U-Boot" coming from this string */
|
||||||
|
|
|
@ -257,6 +257,7 @@ void s_init(void)
|
||||||
watchdog_init();
|
watchdog_init();
|
||||||
set_mux_conf_regs();
|
set_mux_conf_regs();
|
||||||
#ifdef CONFIG_SPL_BUILD
|
#ifdef CONFIG_SPL_BUILD
|
||||||
|
setup_clocks_for_console();
|
||||||
preloader_console_init();
|
preloader_console_init();
|
||||||
do_io_settings();
|
do_io_settings();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue