From a44bc3eb4db9ebda2b457a043702f95f9e1cf9df Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 14 Mar 2013 16:02:59 +0100
Subject: [PATCH] --- yaml --- r: 370662 b: refs/heads/master c:
 29c9b7be7574c486534a79c45982ede00f6a25a9 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/arm/Kconfig.debug                              | 8 ++++++++
 trunk/arch/arm/configs/cns3420vb_defconfig                | 1 +
 .../mach/debug-macro.S => include/debug/cns3xxx.S}        | 0
 4 files changed, 10 insertions(+), 1 deletion(-)
 rename trunk/arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%)

diff --git a/[refs] b/[refs]
index e5492716ac5a..9edd35e90984 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f72a682f79d4eb2d96364d1a9abb7bd16c47afb
+refs/heads/master: 29c9b7be7574c486534a79c45982ede00f6a25a9
diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug
index acddddac7ee4..52f410da464e 100644
--- a/trunk/arch/arm/Kconfig.debug
+++ b/trunk/arch/arm/Kconfig.debug
@@ -103,6 +103,13 @@ choice
 		  Say Y here if you want the debug print routines to direct
 		  their output to the second serial port on these devices.
 
+	config DEBUG_CNS3XXX
+		bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"
+		depends on ARCH_CNS3XXX
+		help
+		  Say Y here if you want the debug print routines to direct
+                  their output to the CNS3xxx UART0.
+
 	config DEBUG_DAVINCI_DA8XX_UART1
 		bool "Kernel low-level debugging on DaVinci DA8XX using UART1"
 		depends on ARCH_DAVINCI_DA8XX
@@ -579,6 +586,7 @@ endchoice
 
 config DEBUG_LL_INCLUDE
 	string
+	default "debug/cns3xxx.S" if DEBUG_CNS3XXX
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/imx.S" if DEBUG_IMX1_UART || \
 				 DEBUG_IMX25_UART || \
diff --git a/trunk/arch/arm/configs/cns3420vb_defconfig b/trunk/arch/arm/configs/cns3420vb_defconfig
index 313627adf46c..b79e98465dd9 100644
--- a/trunk/arch/arm/configs/cns3420vb_defconfig
+++ b/trunk/arch/arm/configs/cns3420vb_defconfig
@@ -21,6 +21,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_IOSCHED_CFQ=m
 CONFIG_ARCH_CNS3XXX=y
 CONFIG_MACH_CNS3420VB=y
+CONFIG_DEBUG_CNS3XXX=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/trunk/arch/arm/mach-cns3xxx/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/cns3xxx.S
similarity index 100%
rename from trunk/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
rename to trunk/arch/arm/include/debug/cns3xxx.S