diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-29 13:43:35 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 17:48:32 +0100 |
commit | 765ff22d54591a24fe81f6a451b953f43e076ced (patch) | |
tree | cd9b31df5ce3626b6e0dae405f68362a6e6dd7c0 | |
parent | Merge tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux int... (diff) | |
download | linux-765ff22d54591a24fe81f6a451b953f43e076ced.tar.xz linux-765ff22d54591a24fe81f6a451b953f43e076ced.zip |
ARM: tango: pass ARM arch level for smc.S
allmodconfig is broken by the addition of the -mcpu=cortex-a9
flag for smc.S:
arch/arm/mach-tango/smc.S:1:0: warning: switch -mcpu=cortex-a9 conflicts with -march=armv6k switch
This sets the flag in the same way that all other platforms
do, to fix the compile error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-tango/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile index 0d7e2b5976e3..99422ea743fd 100644 --- a/arch/arm/mach-tango/Makefile +++ b/arch/arm/mach-tango/Makefile @@ -1,2 +1,3 @@ -asflags-y += -mcpu=cortex-a9 +plus_sec := $(call as-instr,.arch_extension sec,+sec) +AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec) obj-y += setup.o smc.o |