Skip to content

Commit

Permalink
ARM: vexpress: fix ll debug code when building multiplatform
Browse files Browse the repository at this point in the history 
After "ARM: vexpress: Make the debug UART detection more specific",
building allyesconfig in linux-next now gives me:

arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:81: Error: selected processor does not support ARM mode `movw r2,#0xc 091'
arch/arm/kernel/debug.S:81: Error: selected processor does not support ARM mode `movt r2,#0x4 10f'
arch/arm/kernel/debug.S:97: Error: selected processor does not support ARM mode `movw r2,#0xc 091'
arch/arm/kernel/debug.S:97: Error: selected processor does not support ARM mode `movt r2,#0x4 10f'
arch/arm/kernel/debug.S:104: Error: selected processor does not support ARM mode `movw r3,#0x c091'
arch/arm/kernel/debug.S:104: Error: selected processor does not support ARM mode `movt r3,#0x 410f'

Since the code can never get executed on ARMv6 but might
be built in a configuration that has ARMv6 enabled, it's
safe to just mark it in the assembly source for being
ARMv7-only.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Pawel Moll <pawel.moll@arm.com>
  • Loading branch information
Arnd Bergmann committed Nov 8, 2012
1 parent 98fb96a commit d892a91
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/include/debug/vexpress.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT)

.macro addruart,rp,rv,tmp
.arch armv7-a

@ Make an educated guess regarding the memory map:
@ - the original A9 core tile (based on ARM Cortex-A9 r0p1)
Expand Down

0 comments on commit d892a91

Please sign in to comment.