From 12b67054aa84a35099c15087d88310dd181fa8ff Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Fri, 1 Feb 2008 17:32:00 +1000
Subject: [PATCH] --- yaml --- r: 81779 b: refs/heads/master c:
 ae1b5f0d2311057643657b71a272c4748e4b21d2 h: refs/heads/master i:   81777:
 92cbfc7e68155b24ec7b0c299ef6a6e02c5c1edd   81775:
 9a937da9dbe7093eb7cbd2392ec6d0a3027b7b07 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/serial/Kconfig | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2476d2562edd..f1c4e29a10a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9ac1ecb7d43fd9f6424117f4ab218d1cff5920f
+refs/heads/master: ae1b5f0d2311057643657b71a272c4748e4b21d2
diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig
index d962b74e3114..8a053ea21e1d 100644
--- a/trunk/drivers/serial/Kconfig
+++ b/trunk/drivers/serial/Kconfig
@@ -960,6 +960,30 @@ config SERIAL_COLDFIRE
 	  This driver supports the built-in serial ports of the Motorola ColdFire
 	  family of CPUs.
 
+config SERIAL_MCF
+	bool "Coldfire serial support (new style driver)"
+	depends on COLDFIRE
+	select SERIAL_CORE
+	help
+	  This new serial driver supports the Freescale Coldfire serial ports
+	  using the new serial driver subsystem.
+
+config SERIAL_MCF_BAUDRATE
+	int "Default baudrate for Coldfire serial ports"
+	depends on SERIAL_MCF
+	default 19200
+	help
+	  This setting lets you define what the default baudrate is for the
+	  ColdFire serial ports. The usual default varies from board to board,
+	  and this setting is a way of catering for that.
+
+config SERIAL_MCF_CONSOLE
+	bool "Coldfire serial console support"
+	depends on SERIAL_MCF
+	select SERIAL_CORE_CONSOLE
+	help
+	  Enable a ColdFire internal serial port to be the system console.
+
 config SERIAL_68360_SMC
 	bool "68360 SMC uart support"
 	depends on M68360