ARM: highbank: move debug macros to include/debug

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

Also, remove v7 specific movw/movt instructions so this can compile under
v6 mode.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4f9760bd234e2a2e3c19fd15e98718137fd1b52a..d9d8effe67f5c313fae66689e687e2a25b0a179b 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -376,6 +376,7 @@ endchoice
 config DEBUG_LL_INCLUDE
        string
        default "debug/icedcc.S" if DEBUG_ICEDCC
+       default "debug/highbank.S" if DEBUG_HIGHBANK_UART
        default "mach/debug-macro.S"
 
 config EARLY_PRINTK

diff --git a/arch/arm/include/debug/highbank.S b/arch/arm/include/debug/highbank.S
new file mode 100644 (file)
index 0000000..8cad432
--- /dev/null
+++ b/arch/arm/include/debug/highbank.S
@@ -0,0 +1,17 @@
+/*
+ * Debugging macro include header
+ *
+ *  Copyright (C) 1994-1999 Russell King
+ *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+               .macro  addruart,rp,rv,tmp
+               ldr     \rv, =0xfee36000
+               ldr     \rp, =0xfff36000
+               .endm
+
+#include <asm/hardware/debug-pl01x.S>

diff --git a/arch/arm/mach-highbank/include/mach/debug-macro.S b/arch/arm/mach-highbank/include/mach/debug-macro.S
deleted file mode 100644 (file)
index cb57fe5..0000000
--- a/arch/arm/mach-highbank/include/mach/debug-macro.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-               .macro  addruart,rp,rv,tmp
-               movw    \rv, #0x6000
-               movt    \rv, #0xfee3
-               movw    \rp, #0x6000
-               movt    \rp, #0xfff3
-               .endm
-
-#include <asm/hardware/debug-pl01x.S>