From a144c8f0b4dda0d789d0cf4ee608562ba733238e Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Sun, 2 Sep 2012 14:41:34 -0500
Subject: [PATCH] --- yaml --- r: 327102 b: refs/heads/master c:
 bfd5af9940c665ec0148f6d280aab54736ffdbe7 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/arm/Kconfig.debug                              | 8 ++++++++
 .../include/mach/debug-macro.S => include/debug/mvebu.S}  | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)
 rename trunk/arch/arm/{mach-mvebu/include/mach/debug-macro.S => include/debug/mvebu.S} (86%)

diff --git a/[refs] b/[refs]
index f85d05515d7e..1a59cb8425fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa04e4dbd3a0e68b9daf07a096db369b5a92f1bf
+refs/heads/master: bfd5af9940c665ec0148f6d280aab54736ffdbe7
diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug
index 525d9bd35790..3bafdd22ac7a 100644
--- a/trunk/arch/arm/Kconfig.debug
+++ b/trunk/arch/arm/Kconfig.debug
@@ -261,6 +261,13 @@ choice
 		  Say Y here if you want the debug print routines to direct
 		  their output to the serial port on MSM 8960 devices.
 
+	config DEBUG_MVEBU_UART
+		bool "Kernel low-level debugging messages via MVEBU UART"
+		depends on ARCH_MVEBU
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on MVEBU based platforms.
+
 	config DEBUG_REALVIEW_STD_PORT
 		bool "RealView Default UART"
 		depends on ARCH_REALVIEW
@@ -377,6 +384,7 @@ config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
+	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 	default "mach/debug-macro.S"
diff --git a/trunk/arch/arm/mach-mvebu/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/mvebu.S
similarity index 86%
rename from trunk/arch/arm/mach-mvebu/include/mach/debug-macro.S
rename to trunk/arch/arm/include/debug/mvebu.S
index 22825760c7e1..865c6d02b332 100644
--- a/trunk/arch/arm/mach-mvebu/include/mach/debug-macro.S
+++ b/trunk/arch/arm/include/debug/mvebu.S
@@ -11,7 +11,8 @@
  * published by the Free Software Foundation.
 */
 
-#include <mach/armada-370-xp.h>
+#define ARMADA_370_XP_REGS_PHYS_BASE	0xd0000000
+#define ARMADA_370_XP_REGS_VIRT_BASE	0xfeb00000
 
 	.macro	addruart, rp, rv, tmp
 	ldr	\rp, =ARMADA_370_XP_REGS_PHYS_BASE