From 765ff22d54591a24fe81f6a451b953f43e076ced Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 29 Dec 2015 13:43:35 +0100 Subject: [PATCH] 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 --- arch/arm/mach-tango/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile index 0d7e2b5..99422ea 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 -- 2.7.4