ARM: picoxcell: move debug macros to include/debug

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

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jamie Iles <jamie@jamieiles.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index aa56934cd284..b74ed971868d 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -268,6 +268,13 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on MVEBU based platforms.
 
+        config DEBUG_PICOXCELL_UART
+                depends on ARCH_PICOXCELL
+                bool "Use PicoXcell UART for low-level debug"
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on PicoXcell based platforms.
+
         config DEBUG_REALVIEW_STD_PORT
                 bool "RealView Default UART"
                 depends on ARCH_REALVIEW
@@ -392,6 +399,7 @@ config DEBUG_LL_INCLUDE
         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/picoxcell.S" if DEBUG_PICOXCELL_UART
         default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
         default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
                 DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
diff --git a/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/arch/arm/include/debug/picoxcell.S
index 58d4ee3ae949..7419deb1b948 100644
--- a/arch/arm/mach-picoxcell/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/picoxcell.S
@@ -9,10 +9,10 @@
  * accesses to the 8250.
  */
 #include <linux/serial_reg.h>
-#include <mach/hardware.h>
-#include <mach/map.h>
 
 #define UART_SHIFT 2
+#define PICOXCELL_UART1_BASE            0x80230000
+#define PHYS_TO_IO(x)                   (((x) & 0x00ffffff) | 0xfe000000)
 
                 .macro  addruart, rp, rv, tmp
                 ldr     \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)