diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-08 15:05:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-08 16:30:28 +0100 |
| commit | d892a91730013b306cef3b55be6cc0b2755d6d24 (patch) | |
| tree | f10df5d0a3376005dc0949e6057ca2d45a47ff5b | |
| parent | Merge tag 'davinci-for-v3.8/fixes' of git://gitorious.org/linux-davinci/linux... (diff) | |
| download | linux-d892a91730013b306cef3b55be6cc0b2755d6d24.tar.xz linux-d892a91730013b306cef3b55be6cc0b2755d6d24.zip | |
ARM: vexpress: fix ll debug code when building multiplatform
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>
| -rw-r--r-- | arch/arm/include/debug/vexpress.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S index 0c6abbf4c82b..dc8e882a6257 100644 --- a/arch/arm/include/debug/vexpress.S +++ b/arch/arm/include/debug/vexpress.S @@ -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) |