ARM: mvebu: move debug macros to include/debug

Move mvebu debug-macro.S over to common debug macro directory.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>

2 files changed, 10 insertions, 1 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 525d9bd35790..3bafdd22ac7a 100644
--- a/arch/arm/Kconfig.debug
+++ b/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/arch/arm/mach-mvebu/include/mach/debug-macro.S b/arch/arm/include/debug/mvebu.S
index 22825760c7e1..865c6d02b332 100644
--- a/arch/arm/mach-mvebu/include/mach/debug-macro.S
+++ b/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