summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-31 00:04:22 -0500
committerRob Herring <rob.herring@calxeda.com>2012-09-14 09:22:01 -0500
commit2e9bb084e85d7c160586faf91677a0d7798f1596 (patch)
treec10b93a0213c6a32418c7bc85c8ee6990d0d740d /arch
parent91a9fec022f5d98835e27d5307d487da3798040c (diff)
downloadblackbird-op-linux-2e9bb084e85d7c160586faf91677a0d7798f1596.tar.gz
blackbird-op-linux-2e9bb084e85d7c160586faf91677a0d7798f1596.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig.debug1
-rw-r--r--arch/arm/include/debug/highbank.S (renamed from arch/arm/mach-highbank/include/mach/debug-macro.S)6
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4f9760bd234e..d9d8effe67f5 100644
--- 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/mach-highbank/include/mach/debug-macro.S b/arch/arm/include/debug/highbank.S
index cb57fe5bcd04..8cad4322a5a2 100644
--- a/arch/arm/mach-highbank/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/highbank.S
@@ -10,10 +10,8 @@
*/
.macro addruart,rp,rv,tmp
- movw \rv, #0x6000
- movt \rv, #0xfee3
- movw \rp, #0x6000
- movt \rp, #0xfff3
+ ldr \rv, =0xfee36000
+ ldr \rp, =0xfff36000
.endm
#include <asm/hardware/debug-pl01x.S>
OpenPOWER on IntegriCloud