summaryrefslogtreecommitdiff
path: root/src/cpu/ti
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-14 10:31:38 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-03-04 15:40:34 +0100
commit0567c91b22e36eb07e7c7b8a67cbf6b41778db30 (patch)
tree1d8ee38c3e001f8be09b677554c02addf36292e9 /src/cpu/ti
parentab94bbf07221483ec52d072940a8b6206b69dc62 (diff)
downloadcoreboot-0567c91b22e36eb07e7c7b8a67cbf6b41778db30.tar.xz
console: Use single driver entry for UARTs
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 <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5308 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/cpu/ti')
-rw-r--r--src/cpu/ti/am335x/uart.c25
1 files changed, 6 insertions, 19 deletions
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 <types.h>
#include <console/uart.h>
#include <arch/io.h>
-
-#include <console/console.h> /* for __console definition */
-
#include <cpu/ti/am335x/uart.h>
#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