summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-01-11 12:05:31 -0800
committerOlof Johansson <olof@lixom.net>2013-01-11 12:17:58 -0800
commit72533b77d30c2be02672e26b5dde1263d7b4c2be (patch)
treef1225433271f82db7f52dcad2314f159d9c59adf /arch/arm/mach-mvebu/Makefile
parent67c6b2ef2662b17cc2174f2bdc22a7cb818a8376 (diff)
downloadop-kernel-dev-72533b77d30c2be02672e26b5dde1263d7b4c2be.zip
op-kernel-dev-72533b77d30c2be02672e26b5dde1263d7b4c2be.tar.gz
arm: mvebu: Fix compile for multiplatform when ARMv6 is selected
Some systems compile in both ARMv6 and ARMv7 into multiplatform configurations. This means the default compiler flags are for ARMv6, and we will get: arch/arm/mach-mvebu/coherency_ll.S: Assembler messages: arch/arm/mach-mvebu/coherency_ll.S:45: Error: selected processor does not support `dsb' Fix this by specifying ARMv7 flags for coherency_ll.o. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r--arch/arm/mach-mvebu/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 5dcb369..99df4df 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -1,6 +1,8 @@
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
-I$(srctree)/arch/arm/plat-orion/include
+AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
+
obj-y += system-controller.o
obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
OpenPOWER on IntegriCloud