Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index e5ce98e..070031d 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -62,15 +62,6 @@ config SERIAL_8250_CONSOLE
 
          If unsure, say N.
 
-config SERIAL_8250_HCDP
-       bool "Console device discovery via EFI HCDP table"
-       depends on IA64
-       depends on SERIAL_8250_CONSOLE=y
-       ---help---
-         If you wish to make the serial console port described by the EFI
-         HCDP table available for use as serial console, say Y here.  See
-         <http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf>.
-
 config SERIAL_8250_CS
        tristate "8250/16550 PCMCIA device support"
        depends on PCMCIA && SERIAL_8250
@@ -603,5 +594,88 @@ config SERIAL_PMACZILOG_CONSOLE
          on your PowerMac as the console, you can do so by answering
          Y to this option.
 
+config SERIAL_LH7A40X
+       tristate "Sharp LH7A40X embedded UART support"
+       depends on ARM && ARCH_LH7A40X
+       select SERIAL_CORE
+       help
+         This enables support for the three on-board UARTs of the
+         Sharp LH7A40X series CPUs.  Choose Y or M.
+
+config SERIAL_LH7A40X_CONSOLE
+       bool "Support for connsole on Sharp LH7A40X serial port"
+       depends on SERIAL_LH7A40X=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use one of the serial ports as the
+         system console--the system console is the device which
+         receives all kernel messages and warnings and which allows
+         logins in single user mode.
+
+         Even if you say Y here, the currently visible framebuffer console
+         (/dev/tty0) will still be used as the default system console, but
+         you can alter that using a kernel command line, for example
+         "console=ttyAM1".
+
+config SERIAL_CPM
+       tristate "CPM SCC/SMC serial port support"
+       depends on CPM2 || 8xx
+       select SERIAL_CORE
+       help
+         This driver supports the SCC and SMC serial ports on Motorola 
+         embedded PowerPC that contain a CPM1 (8xx) or CPM2 (8xxx)
+
+config SERIAL_CPM_CONSOLE
+       bool "Support for console on CPM SCC/SMC serial port"
+       depends on SERIAL_CPM=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use a SCC or SMC CPM UART as the system
+         console (the system console is the device which receives all kernel
+         messages and warnings and which allows logins in single user mode).
+
+         Even if you say Y here, the currently visible framebuffer 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=ttyCPM0". (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_CPM_SCC1
+       bool "Support for SCC1 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SCC1 as a serial port
+
+config SERIAL_CPM_SCC2
+       bool "Support for SCC2 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SCC2 as a serial port
+
+config SERIAL_CPM_SCC3
+       bool "Support for SCC3 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SCC3 as a serial port
+
+config SERIAL_CPM_SCC4
+       bool "Support for SCC4 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SCC4 as a serial port
+
+config SERIAL_CPM_SMC1
+       bool "Support for SMC1 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SMC1 as a serial port
+
+config SERIAL_CPM_SMC2
+       bool "Support for SMC2 serial port"
+       depends on SERIAL_CPM=y
+       help
+         Select the is option to use SMC2 as a serial port
+
 endmenu