UART: Update for Sparc drivers.

diff --git a/drivers/serial/Config.help b/drivers/serial/Config.help
index c9f938fbb513f1b3670d99bd14ea060963b7959a..c5907d78e1b2515d8056d9a2d8495818782f6101 100644 (file)
--- a/drivers/serial/Config.help
+++ b/drivers/serial/Config.help
@@ -223,3 +223,16 @@ CONFIG_SERIAL_SA1100_CONSOLE
 #  you can make the first serial port the console by answering Y to
 #  this option.
 
+CONFIG_SERIAL_SUNZILOG
+  This driver supports the Zilog8530 serial ports found on many Sparc
+  systems.  Say Y or M if you want to be able to these serial ports.
+
+CONFIG_SERIAL_SUNSU
+  This driver supports the 8250 serial ports that run the keyboard and
+  mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able
+  to these serial ports.
+
+CONFIG_SERIAL_SUNSAB
+  This driver supports the Siemens SAB82532 DUSCC serial ports on newer
+  (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these
+  serial ports.

diff --git a/drivers/serial/Config.in b/drivers/serial/Config.in
index 7783775e9420075214a6b85f909c89bb0cdf13e4..b25758597008e24ea2c5a4aecf3f01db98010d93 100644 (file)
--- a/drivers/serial/Config.in
+++ b/drivers/serial/Config.in
@@ -51,16 +51,28 @@ if [ "$CONFIG_ARM" = "y" ]; then
    dep_bool '  Console on SA1100 serial port' CONFIG_SERIAL_SA1100_CONSOLE $CONFIG_SERIAL_SA1100
 fi
 
+if [ "$CONFIG_SPARC" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
+   define_bool CONFIG_SERIAL_SUNCORE y
+   define_bool CONFIG_SERIAL_CORE_CONSOLE y
+   tristate 'Sun Zilog8530 serial support' CONFIG_SERIAL_SUNZILOG
+   dep_tristate 'Sun SU serial support' CONFIG_SERIAL_SUNSU $CONFIG_PCI
+   dep_tristate 'Sun Siemens SAB82532 serial support' CONFIG_SERIAL_SUNSAB $CONFIG_PCI
+fi
+
 if [ "$CONFIG_SERIAL_AMBA" = "y"   -o "$CONFIG_SERIAL_CLPS711X" = "y" -o \
      "$CONFIG_SERIAL_21285" = "y"  -o "$CONFIG_SERIAL_SA1100" = "y" -o \
      "$CONFIG_SERIAL_ANAKIN" = "y" -o "$CONFIG_SERIAL_UART00" = "y" -o \
-     "$CONFIG_SERIAL_8250" = "y"   -o "$CONFIG_SERIAL_ROCKETPORT" = "y" ]; then
+     "$CONFIG_SERIAL_8250" = "y"   -o "$CONFIG_SERIAL_ROCKETPORT" = "y" -o \
+     "$CONFIG_SERIAL_SUNZILOG" = "y" -o "$CONFIG_SERIAL_SUNSU" = "y" -o \
+     "$CONFIG_SERIAL_SUNSAB" = "y" ]; then
    define_bool CONFIG_SERIAL_CORE y
 else
    if [ "$CONFIG_SERIAL_AMBA" = "m"   -o "$CONFIG_SERIAL_CLPS711X" = "m" -o \
         "$CONFIG_SERIAL_21285" = "m"  -o "$CONFIG_SERIAL_SA1100" = "m" -o \
         "$CONFIG_SERIAL_ANAKIN" = "m" -o "$CONFIG_SERIAL_UART00" = "m" -o \
-        "$CONFIG_SERIAL_8250" = "m"   -o "$CONFIG_SERIAL_ROCKETPORT" = "m" ]; then
+        "$CONFIG_SERIAL_8250" = "m"   -o "$CONFIG_SERIAL_ROCKETPORT" = "m" -o \
+        "$CONFIG_SERIAL_SUNZILOG" = "m" -o "$CONFIG_SERIAL_SUNSU" = "m" -o \
+        "$CONFIG_SERIAL_SUNSAB" = "m" ]; then
       define_bool CONFIG_SERIAL_CORE m
    fi
 fi
@@ -70,7 +82,8 @@ if [ "$CONFIG_SERIAL_AMBA_CONSOLE" = "y" -o \
      "$CONFIG_SERIAL_SA1100_CONSOLE" = "y" -o \
      "$CONFIG_SERIAL_ANAKIN_CONSOLE" = "y" -o \
      "$CONFIG_SERIAL_UART00_CONSOLE" = "y" -o \
-     "$CONFIG_SERIAL_8250_CONSOLE" = "y" ]; then
+     "$CONFIG_SERIAL_8250_CONSOLE" = "y"  -o \
+     "$CONFIG_SERIAL_SUNCORE" = "y" ]; then
    define_bool CONFIG_SERIAL_CORE_CONSOLE y
 fi
 

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index a86d21a93175b70b6e9a693084df35d696c3db20..ac3963211971e0cd605c04f0635e43234f40acbf 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -4,7 +4,7 @@
 #  $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
 #
 
-export-objs    := core.o 8250.o
+export-objs    := core.o 8250.o sunsu.o
 
 serial-8250-y :=
 serial-8250-$(CONFIG_PCI) += 8250_pci.o
@@ -20,5 +20,7 @@ obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 obj-$(CONFIG_SERIAL_UART00) += uart00.o
 obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
 obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
+obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
+obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 
 include $(TOPDIR)/Rules.make