From 70342a7f51a0069446966c42db4dbc44f6db16ee Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 14 Mar 2014 22:28:29 +0200 Subject: uart: Support multiple ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The port for console remains to be a compile time constant. The Kconfig option is changed to select an UART port with index to avoid putting map of UART base addresses in Kconfigs. With this change it is possible to have other than debug console on different UART port. Change-Id: Ie1845a946f8d3b2604ef5404edb31b2e811f3ccd Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5342 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks Reviewed-by: Paul Menzel --- src/mainboard/ti/beaglebone/bootblock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mainboard/ti/beaglebone/bootblock.c') diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c index 9e0a62e719..6cc7a8c25d 100644 --- a/src/mainboard/ti/beaglebone/bootblock.c +++ b/src/mainboard/ti/beaglebone/bootblock.c @@ -42,22 +42,22 @@ void bootblock_mainboard_init(void) setbits_le32((uint32_t *)(0x4804c000 + 0x13c), 0x5 << 21); /* Set up the UART we're going to use */ - if (CONFIG_CONSOLE_SERIAL_UART0) { + if (CONFIG_UART_FOR_CONSOLE == 0) { am335x_pinmux_uart0(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00400 + 0xb4); - } else if (CONFIG_CONSOLE_SERIAL_UART1) { + } else if (CONFIG_UART_FOR_CONSOLE == 1) { am335x_pinmux_uart1(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00000 + 0x6c); - } else if (CONFIG_CONSOLE_SERIAL_UART2) { + } else if (CONFIG_UART_FOR_CONSOLE == 2) { am335x_pinmux_uart2(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00000 + 0x70); - } else if (CONFIG_CONSOLE_SERIAL_UART3) { + } else if (CONFIG_UART_FOR_CONSOLE == 3) { am335x_pinmux_uart3(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00000 + 0x74); - } else if (CONFIG_CONSOLE_SERIAL_UART4) { + } else if (CONFIG_UART_FOR_CONSOLE == 4) { am335x_pinmux_uart4(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00000 + 0x78); - } else if (CONFIG_CONSOLE_SERIAL_UART5) { + } else if (CONFIG_UART_FOR_CONSOLE == 5) { am335x_pinmux_uart5(); uart_clock_ctrl = (void *)(uintptr_t)(0x44e00000 + 0x38); } -- cgit v1.2.3