diff options
| author | Heiko Schocher <hs@denx.de> | 2013-08-05 16:00:37 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-15 18:38:36 -0400 |
| commit | 9c8deaeeb79523d45d836c730c59c857f53b5f65 (patch) | |
| tree | b1a27e32a94ee5cb1e82125589ab9450ac2891a5 | |
| parent | 7f442e36f15789eb4924222f8922c924215d4c6c (diff) | |
| download | talos-obmc-uboot-9c8deaeeb79523d45d836c730c59c857f53b5f65.tar.gz talos-obmc-uboot-9c8deaeeb79523d45d836c730c59c857f53b5f65.zip | |
arm, da850: enable the correct uart in arch_cpu_init()
in arch_cpu_init() uart2 is fix enabled, without reference the
setting from CONFIG_SYS_NS16550_COM1. Use the setting from
CONFIG_SYS_NS16550_COM1 for enabling the console.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Christian Riesch <christian.riesch@omicron.at>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c index f6bf1ef8cb..a3bbbb869d 100644 --- a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c +++ b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c @@ -299,7 +299,11 @@ int arch_cpu_init(void) */ writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST | DAVINCI_UART_PWREMU_MGMT_UTRST), +#if (CONFIG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE) + &davinci_uart0_ctrl_regs->pwremu_mgmt); +#else &davinci_uart2_ctrl_regs->pwremu_mgmt); +#endif #if defined(CONFIG_SYS_DA850_DDR_INIT) da850_ddr_setup(); |
