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>

3 files changed, 7 insertions, 57 deletions

diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index f158670a34..df08e80444 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -17,8 +17,7 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c
 bootblock-y += console.c
 bootblock-y += die.c
 
-ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
-ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
+ramstage-$(CONFIG_CONSOLE_SERIAL) += uart_console.c
 ramstage-$(CONFIG_SPKMODEM) += spkmodem_console.c
 ramstage-$(CONFIG_CONSOLE_USB) += usbdebug_console.c
 ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c
deleted file mode 100644
index 52f59f643a..0000000000
--- a/src/console/uart8250_console.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2003 Eric Biederman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <console/console.h>
-#include <console/uart.h>
-
-static void ttyS0_init(void)
-{
-	uart_init();
-}
-
-static void ttyS0_tx_byte(unsigned char data)
-{
-	uart_tx_byte(data);
-}
-
-static void ttyS0_tx_flush(void)
-{
-	uart_tx_flush();
-}
-
-static unsigned char ttyS0_rx_byte(void)
-{
-	return uart_rx_byte();
-}
-
-static int ttyS0_tst_byte(void)
-{
-	return uart_can_rx_byte();
-}
-
-static const struct console_driver uart8250_console __console = {
-	.init     = ttyS0_init,
-	.tx_byte  = ttyS0_tx_byte,
-	.tx_flush = ttyS0_tx_flush,
-	.rx_byte  = ttyS0_rx_byte,
-	.tst_byte = ttyS0_tst_byte,
-};
diff --git a/src/console/uart8250mem_console.c b/src/console/uart_console.c
index 7e52aed273..e2cd6a8b81 100644
--- a/src/console/uart8250mem_console.c
+++ b/src/console/uart_console.c
@@ -40,12 +40,17 @@ static unsigned char uartmem_rx_byte(void)
 	return uart_rx_byte();
 }
 
+/* This only relevant with x86 with GDB_STUB enabled.*/
 static int uartmem_tst_byte(void)
 {
+#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
 	return uart_can_rx_byte();
+#else
+	return 0;
+#endif
 }
 
-static const struct console_driver uart8250mem_console __console = {
+static const struct console_driver uart_console __console = {
 	.init     = uartmem_init,
 	.tx_byte  = uartmem_tx_byte,
 	.tx_flush = uartmem_tx_flush,