From 0567c91b22e36eb07e7c7b8a67cbf6b41778db30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 14 Feb 2014 10:31:38 +0200 Subject: console: Use single driver entry for UARTs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit UARTs now have unified prototypes and can use a single entry in the list of drivers for ramstage. Change-Id: I315daaf9a83cfa60f1a270146c729907a1d6d45b Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5308 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/cpu/ti/am335x/uart.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'src/cpu/ti/am335x/uart.c') diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index f6f1a8d137..27051ea2cc 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/src/cpu/ti/am335x/uart.c @@ -20,9 +20,6 @@ #include #include #include - -#include /* for __console definition */ - #include #define EFR_ENHANCED_EN (1 << 4) @@ -162,28 +159,18 @@ unsigned int uart_platform_refclk(void) return 48000000; } -static void am335x_uart_init_dev(void) -{ - uint16_t div = (uint16_t) uart_baudrate_divisor( - default_baudrate(), uart_platform_refclk(), 16); - am335x_uart_init(div); -} - #if !defined(__PRE_RAM__) uint32_t uartmem_getbaseaddr(void) { return CONFIG_CONSOLE_SERIAL_UART_ADDRESS; } +#endif -static const struct console_driver exynos5_uart_console __console = { - .init = am335x_uart_init_dev, - .tx_byte = am335x_uart_tx_byte, - .rx_byte = am335x_uart_rx_byte, -}; -#else void uart_init(void) { - am335x_uart_init_dev(); + uint16_t div = (uint16_t) uart_baudrate_divisor( + default_baudrate(), uart_platform_refclk(), 16); + am335x_uart_init(div); } unsigned char uart_rx_byte(void) @@ -196,6 +183,6 @@ void uart_tx_byte(unsigned char data) am335x_uart_tx_byte(data); } -void uart_tx_flush(void) { +void uart_tx_flush(void) +{ } -#endif -- cgit v1.2.3