Skip to content

Commit

Permalink
ARM: highbank: move debug macros to include/debug
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Rob Herring committed Sep 14, 2012
1 parent 91a9fec commit 2e9bb08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions .../mach-highbank/include/mach/debug-macro.S → arch/arm/include/debug/highbank.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 2e9bb08

Please sign in to comment.