Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic

[sfrench/cifs-2.6.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 0e5ccb25bdb178fc3d1276fcf15f6b6783e07ff3..dbac90e2e20904377dd63d19a9319ea82a331799 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -139,6 +139,7 @@ config SERIAL_ATMEL_CONSOLE
        bool "Support for console on AT91 serial port"
        depends on SERIAL_ATMEL=y
        select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
        help
          Say Y here if you wish to use an on-chip UART on a Atmel
          AT91 processor as the system console (the system
@@ -236,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE
 
 config SERIAL_SAMSUNG
        tristate "Samsung SoC serial support"
-       depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_APPLE || COMPILE_TEST
+       depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_APPLE || ARCH_ARTPEC || COMPILE_TEST
        select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung
@@ -653,7 +654,7 @@ config SERIAL_IP22_ZILOG_CONSOLE
 
 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
-       depends on SUPERH || ARCH_RENESAS || H8300 || COMPILE_TEST
+       depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
        select SERIAL_CORE
        select SERIAL_MCTRL_GPIO if GPIOLIB
 
@@ -662,7 +663,6 @@ config SERIAL_SH_SCI_NR_UARTS
        range 1 64 if 64BIT
        range 1 32 if !64BIT
        depends on SERIAL_SH_SCI
-       default "3" if H8300
        default "10" if SUPERH
        default "18" if ARCH_RENESAS
        default "2"
@@ -678,7 +678,7 @@ config SERIAL_SH_SCI_EARLYCON
        depends on SERIAL_SH_SCI=y
        select SERIAL_CORE_CONSOLE
        select SERIAL_EARLYCON
-       default ARCH_RENESAS || H8300
+       default ARCH_RENESAS
 
 config SERIAL_SH_SCI_DMA
        bool "DMA support" if EXPERT
@@ -1099,7 +1099,8 @@ config SERIAL_TIMBERDALE
 config SERIAL_BCM63XX
        tristate "Broadcom BCM63xx/BCM33xx UART support"
        select SERIAL_CORE
-       depends on COMMON_CLK
+       depends on ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+       default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
        help
          This enables the driver for the onchip UART core found on
          the following chipsets:
@@ -1445,6 +1446,7 @@ config SERIAL_STM32_CONSOLE
 config SERIAL_MVEBU_UART
        bool "Marvell EBU serial port support"
        depends on ARCH_MVEBU || COMPILE_TEST
+       depends on COMMON_CLK
        select SERIAL_CORE
        help
          This driver is for Marvell EBU SoC's UART. If you have a machine
@@ -1562,6 +1564,31 @@ config SERIAL_LITEUART_CONSOLE
          and warnings and which allows logins in single user mode).
          Otherwise, say 'N'.
 
+config SERIAL_SUNPLUS
+       tristate "Sunplus UART support"
+       depends on ARCH_SUNPLUS || COMPILE_TEST
+       select SERIAL_CORE
+       help
+         Select this option if you would like to use Sunplus serial port on
+         Sunplus SoC SP7021.
+         If you enable this option, Sunplus serial ports in the system will
+         be registered as ttySUPx.
+         This driver can also be built as a module. If so, the module will be
+         called sunplus-uart.
+
+config SERIAL_SUNPLUS_CONSOLE
+       bool "Console on Sunplus UART"
+       depends on SERIAL_SUNPLUS
+       select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
+       help
+         Select this option if you would like to use a Sunplus UART as the
+         system console.
+         Even if you say Y here, the currently visible virtual console
+         (/dev/tty0) will still be used as the system console by default, but
+         you can alter that using a kernel command line option such as
+         "console=ttySUPx".
+
 endmenu
 
 config SERIAL_MCTRL_GPIO