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>

2 files changed, 19 insertions, 26 deletions

diff --git a/src/console/Kconfig b/src/console/Kconfig
index d77bb9e4c7..65fc1aaa48 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -29,37 +29,29 @@ config SQUELCH_EARLY_SMP
 config CONSOLE_SERIAL
 	bool "Serial port console output"
 	default y
+	depends on DRIVERS_UART_8250IO || DRIVERS_UART_8250MEM || HAVE_UART_SPECIAL
 	help
-	  Send coreboot debug output to a serial port (should be one or more of
-	  CONSOLE_SERIAL8250, CONSOLE_SERIAL8250MEM, CONSOLE_SERIAL_UART)
+	  Send coreboot debug output to a serial port.
 
-config CONSOLE_SERIAL8250
-	bool "Serial port console output (I/O mapped, 8250-compatible)"
-	depends on CONSOLE_SERIAL
-	depends on HAVE_UART_IO_MAPPED
-	default y
-	help
-	  Send coreboot debug output to an I/O mapped serial port console.
+	  The type of serial port driver selected based on your configuration is
+	  shown on the following menu line. Supporting multiple different types
+	  of UARTs in one build is not supported.
 
-config CONSOLE_SERIAL8250MEM
-	bool "Serial port console output (memory mapped, 8250-compatible)"
-	depends on CONSOLE_SERIAL
-	depends on HAVE_UART_MEMORY_MAPPED
-	help
-	  Send coreboot debug output to a memory mapped serial port console.
+if CONSOLE_SERIAL
+
+	comment "I/O mapped, 8250-compatible"
+	depends on DRIVERS_UART_8250IO
 
-config CONSOLE_SERIAL_UART
-	bool "Serial port console output (device-specific UART)"
-	depends on CONSOLE_SERIAL
+	comment "memory mapped, 8250-compatible"
+	depends on DRIVERS_UART_8250MEM
+
+	comment "device-specific UART"
 	depends on HAVE_UART_SPECIAL
-	default y
-	help
-	  Send coreboot debug output to a device-specific serial port console.
 
 choice
 	prompt "Serial port for 8250"
 	default CONSOLE_SERIAL_COM1
-	depends on CONSOLE_SERIAL8250
+	depends on DRIVERS_UART_8250IO
 
 config CONSOLE_SERIAL_COM1
 	bool "COM1/ttyS0, I/O port 0x3f8"
@@ -82,7 +74,7 @@ endchoice
 
 config TTYS0_BASE
 	hex
-	depends on CONSOLE_SERIAL8250
+	depends on DRIVERS_UART_8250IO
 	default 0x3f8 if CONSOLE_SERIAL_COM1
 	default 0x2f8 if CONSOLE_SERIAL_COM2
 	default 0x3e8 if CONSOLE_SERIAL_COM3
@@ -93,7 +85,6 @@ config TTYS0_BASE
 choice
 	prompt "Baud rate"
 	default CONSOLE_SERIAL_115200
-	depends on CONSOLE_SERIAL
 
 config CONSOLE_SERIAL_115200
 	bool "115200"
@@ -133,7 +124,9 @@ config TTYS0_BAUD
 config TTYS0_LCS
 	int
 	default 3
-	depends on CONSOLE_SERIAL8250 || CONSOLE_SERIAL8250MEM
+	depends on DRIVERS_UART_8250IO || DRIVERS_UART_8250MEM
+
+endif # CONSOLE_SERIAL
 
 config SPKMODEM
 	bool "spkmodem (console on speaker) console output"
diff --git a/src/console/uart_console.c b/src/console/uart_console.c
index e2cd6a8b81..f5535d72b8 100644
--- a/src/console/uart_console.c
+++ b/src/console/uart_console.c
@@ -43,7 +43,7 @@ static unsigned char uartmem_rx_byte(void)
 /* This only relevant with x86 with GDB_STUB enabled.*/
 static int uartmem_tst_byte(void)
 {
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
+#if CONFIG_DRIVERS_UART_8250IO || CONFIG_DRIVERS_UART_8250MEM
 	return uart_can_rx_byte();
 #else
 	return 0;