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>
This commit is contained in:
Kyösti Mälkki
2014-02-13 17:16:22 +02:00
committed by Patrick Georgi
parent bbf6f3d384
commit afa7b13b93
24 changed files with 79 additions and 89 deletions

View File

@@ -30,7 +30,7 @@ subdirs-y += parade
subdirs-y += realtek
subdirs-y += sil
subdirs-y += trident
subdirs-y += uart
subdirs-$(CONFIG_DRIVERS_UART) += uart
subdirs-y += usb
subdirs-y += ics
subdirs-y += spi

View File

@@ -1,7 +1,7 @@
config DRIVERS_OXFORD_OXPCIE
bool "Oxford OXPCIe952"
default n
select HAVE_UART_MEMORY_MAPPED
select DRIVERS_UART_8250MEM
help
Support for Oxford OXPCIe952 serial port PCIe cards.
Currently only devices with the vendor ID 0x1415 and device ID

View File

@@ -1,4 +1,4 @@
ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y)
ifeq ($(CONFIG_CONSOLE_SERIAL),y)
ramstage-y += oxpcie_early.c oxpcie.c
romstage-y += oxpcie_early.c
endif

View File

@@ -1,10 +1,19 @@
# This should default to N and be set by SuperI/O drivers that have an UART
config HAVE_UART_IO_MAPPED
config DRIVERS_UART
bool
default y if CONSOLE_SERIAL
default n
config DRIVERS_UART_8250IO
bool "Serial port on SuperIO"
depends on !ARCH_ARMV7
default n if NO_UART_ON_SUPERIO
default y if ARCH_X86
config HAVE_UART_MEMORY_MAPPED
# Select this for mainboard without SuperIO serial port.
config NO_UART_ON_SUPERIO
def_bool n
config DRIVERS_UART_8250MEM
bool
default n

View File

@@ -1,28 +1,25 @@
ifeq ($(CONFIG_CONSOLE_SERIAL),y)
romstage-y += util.c
ramstage-y += util.c
bootblock-y += util.c
smm-$(CONFIG_DEBUG_SMI) += util.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250),y)
# Add the driver, only one can be enabled. The driver files may
# be located in the soc/ or cpu/ directories instead of here.
ifeq ($(CONFIG_DRIVERS_UART_8250IO),y)
romstage-y += uart8250io.c
ramstage-y += uart8250io.c
smm-$(CONFIG_DEBUG_SMI) += uart8250io.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y)
ifeq ($(CONFIG_DRIVERS_UART_8250MEM),y)
romstage-y += uart8250mem.c
ramstage-y += uart8250mem.c
smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
ifeq ($(CONFIG_DRIVERS_UART_PL011),y)
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
romstage-$(CONFIG_EARLY_CONSOLE) += pl011.c
ramstage-y += pl011.c
endif
endif