commit afa7b13b9355b3df3da7606d434cb8b450316ab9
author Kyösti Mälkki <kyosti.malkki@gmail.com> Thu Feb 13 17:16:22 2014 +0200
committer Patrick Georgi <patrick@georgi-clan.de> Wed Apr 09 11:24:43 2014 +0200
tree 6f6a712a477b2be52f353eb2e7db69c587914325
parent bbf6f3d384caf25efdfeca0fc5eaac13319a6a43

uart: Redefine Kconfig options

Option DRIVERS_UART builds with support for UART hardware.
Option CONSOLE_SERIAL enables the console output for UART.

Those x86 boards that do not have serial port on SuperIO should select
NO_UART_ON_SUPERIO to disable 8250 UART for the default configuration.

Removes:
  CONSOLE_SERIAL_UART
  HAVE_UART_IO_MAPPED
  HAVE_UART_MEMORY_MAPPED

Renames:
  CONSOLE_SERIAL8250     ->  DRIVERS_UART_8250IO
  CONSOLE_SERIAL8250MEM  ->  DRIVERS_UART_8250MEM

Change-Id: Id3afa05f85c0d6849746886db8b6c2ed6c846b61
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5311
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

src/arch/x86/lib/romcc_console.c

diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index 66c81db..4bd3ad4 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -30,7 +30,7 @@
  */
 #define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO
 #include "drivers/uart/util.c"
 #include "drivers/uart/uart8250io.c"
 #endif
@@ -40,7 +40,7 @@
 
 static void __console_tx_byte(unsigned char byte)
 {
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
 	uart_tx_byte(byte);
 #endif
 #if CONFIG_CONSOLE_NE2K
@@ -61,7 +61,7 @@
 static void __console_tx_char(int loglevel, unsigned char byte)
 {
 	if (console_loglevel >= loglevel) {
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
 		uart_tx_byte(byte);
 #endif
 #if CONFIG_CONSOLE_NE2K