summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Martin <dave.martin@linaro.org>2013-05-02 12:38:10 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 13:14:34 +0200
commit70100a02268423b7bceafdf0ed6b0245f9baf7e8 (patch)
tree57705223d19b648b06353e47035c1f3ba01e2ecb
parentMerge branch 'mcpm' of git://git.linaro.org/people/nico/linux into devel-stable (diff)
downloadlinux-70100a02268423b7bceafdf0ed6b0245f9baf7e8.tar.xz
linux-70100a02268423b7bceafdf0ed6b0245f9baf7e8.zip
ARM: 7709/1: mcpm: Add explicit AFLAGS to support v6/v7 multiplatform kernels
The full mcpm layer is not likely to be relevant to v6 based platforms, so a multiplatform kernel won't use that code if booted on v6 hardware. This patch modifies the AFLAGS for affected mcpm .S files to specify armv7-a explicitly for that code. Signed-off-by: Dave Martin <dave.martin@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/common/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 48c0ee578174..53e68b163196 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -12,3 +12,5 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
+AFLAGS_mcpm_head.o := -march=armv7-a
+AFLAGS_vlock.o := -march=armv7-a