]> git.sur5r.net Git - u-boot/commitdiff
arm, da850: enable the correct uart in arch_cpu_init()
authorHeiko Schocher <hs@denx.de>
Mon, 5 Aug 2013 14:00:37 +0000 (16:00 +0200)
committerTom Rini <trini@ti.com>
Thu, 15 Aug 2013 22:38:36 +0000 (18:38 -0400)
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>
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c

index f6bf1ef8cbc89590a3dfb493bb99f1bc65d04579..a3bbbb869dc259e9d44fb790a8c0ab3b6b48fab2 100644 (file)
@@ -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();