diff options
| author | Simon Schwarz <simonschwarzcor@googlemail.com> | 2011-09-14 15:14:46 -0400 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-09-30 22:00:54 +0200 |
| commit | 63ffcfcbd0b9798e630fedda03f0d64f83715f6b (patch) | |
| tree | 24469f3f4c047d3f6449088ff814d81e7612252f /arch/arm/cpu | |
| parent | cdbc2773c2d988705a95ad140ce96cfc8c881135 (diff) | |
| download | u-boot-imx-63ffcfcbd0b9798e630fedda03f0d64f83715f6b.zip u-boot-imx-63ffcfcbd0b9798e630fedda03f0d64f83715f6b.tar.gz u-boot-imx-63ffcfcbd0b9798e630fedda03f0d64f83715f6b.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 1 |
2 files changed, 2 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..1d301f4 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -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) { const char *u_boot_rev = U_BOOT_VERSION; @@ -259,7 +260,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 309b244..8584fdd 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -257,6 +257,7 @@ void s_init(void) watchdog_init(); set_mux_conf_regs(); #ifdef CONFIG_SPL_BUILD + setup_clocks_for_console(); preloader_console_init(); do_io_settings(); #endif |