vserver 1.9.5.x5

[linux-2.6.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6f8984a..ab80354 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -10,7 +10,7 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"
-       depends on (BROKEN || !SPARC64)
+       depends on (BROKEN || !(SPARC64 || SPARC32))
        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard
@@ -321,7 +321,7 @@ config SERIAL_UART00
        select SERIAL_CORE
        help
          Say Y here if you want to use the hard logic uart on Excalibur. This
-         driver also supports soft logic implentations of this uart core.
+         driver also supports soft logic implementations of this uart core.
 
 config SERIAL_UART00_CONSOLE
        bool "Support for console on Excalibur serial port"
@@ -338,6 +338,20 @@ config SERIAL_UART00_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
+config SERIAL_MPSC
+       bool "Marvell MPSC serial port support"
+       depends on PPC32 && MV64X60
+       select SERIAL_CORE
+       help
+         Say Y here if you want to use the Marvell MPSC serial controller.
+
+config SERIAL_MPSC_CONSOLE
+       bool "Support for console on Marvell MPSC serial port"
+       depends on SERIAL_MPSC
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you want to support a serial console on a Marvell MPSC.
+
 config SERIAL_PXA
        bool "PXA serial port support"
        depends on ARM && ARCH_PXA
@@ -386,6 +400,29 @@ config SERIAL_SA1100_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
+config SERIAL_IMX
+       bool "IMX serial port support"
+       depends on ARM && ARCH_IMX
+       select SERIAL_CORE
+       help
+         If you have a machine based on a Motorola IMX CPU you
+         can enable its onboard serial port by enabling this option.
+
+config SERIAL_IMX_CONSOLE
+       bool "Console on IMX serial port"
+       depends on SERIAL_IMX
+       select SERIAL_CORE_CONSOLE
+       help
+         If you have enabled the serial port on the Motorola IMX
+         CPU you can make it the console by answering Y to this option.
+
+         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=ttySA0". (Try "man bootparam" or see the documentation of
+         your boot loader (lilo or loadlin) about how to pass options to the
+         kernel at boot time.)
+
 config SERIAL_SUNCORE
        bool
        depends on SPARC32 || SPARC64
@@ -492,7 +529,6 @@ config SERIAL_IP22_ZILOG_CONSOLE
        bool "Console on IP22 Zilog8530 serial port"
        depends on SERIAL_IP22_ZILOG=y
        select SERIAL_CORE_CONSOLE
-       help
 
 config V850E_UART
        bool "NEC V850E on-chip UART support"
@@ -604,7 +640,7 @@ config SERIAL_LH7A40X
          Sharp LH7A40X series CPUs.  Choose Y or M.
 
 config SERIAL_LH7A40X_CONSOLE
-       bool "Support for connsole on Sharp LH7A40X serial port"
+       bool "Support for console on Sharp LH7A40X serial port"
        depends on SERIAL_LH7A40X=y
        select SERIAL_CORE_CONSOLE
        help
@@ -727,4 +763,51 @@ config SERIAL_ICOM
          This driver can also be built as a module.  If so, the module
          will be called icom.
 
+config SERIAL_M32R_SIO
+       bool "M32R SIO I/F"
+       depends on M32R
+       default y
+       select SERIAL_CORE
+       help
+         Say Y here if you want to use the M32R serial controller.
+
+config SERIAL_M32R_SIO_CONSOLE
+       bool "use SIO console"
+       depends on SERIAL_M32R_SIO=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you want to support a serial console.
+
+         If you use an M3T-M32700UT or an OPSPUT platform,
+         please say also y for SERIAL_M32R_PLDSIO.
+
+config SERIAL_M32R_PLDSIO
+       bool "M32R SIO I/F on a PLD"
+       depends on SERIAL_M32R_SIO=y
+       default n
+       help
+         Say Y here if you want to use the M32R serial controller
+         on a PLD (Programmable Logic Device).
+
+         If you use an M3T-M32700UT or an OPSPUT platform,
+         please say Y.
+
+config SERIAL_TXX9
+       bool "TMPTX39XX/49XX SIO support"
+       depends HAS_TXX9_SERIAL
+       select SERIAL_CORE
+       default y
+
+config HAS_TXX9_SERIAL
+       bool
+
+config SERIAL_TXX9_CONSOLE
+       bool "TMPTX39XX/49XX SIO Console support"
+       depends on SERIAL_TXX9=y
+       select SERIAL_CORE_CONSOLE
+
+config SERIAL_TXX9_STDSERIAL
+       bool "TX39XX/49XX SIO act as standard serial"
+       depends on !SERIAL_8250 && SERIAL_TXX9
+
 endmenu