summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-03-19 20:14:40 (GMT)
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-04-05 19:59:51 (GMT)
commit176a1b3dadf08835b9435bed4957daa066702a39 (patch)
treef502750195f781b4ec530c185f4563ca8651ccbb /arch/arm/mach-at91
parent598e085590fc5ac1fecff00e842a8a6c2ae010e5 (diff)
downloadlinux-176a1b3dadf08835b9435bed4957daa066702a39.tar.xz
ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
When compiling for multiplatform for both ARMv6 and ARMv7, the default compiler flags are for ARMv6, and results in: arch/arm/mach-at91/pm_suspend.S:144: Error: selected processor does not support ARM mode `dsb' Enforce ARMv7 flags for pm_suspend.o when CPU_V7 is selected. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index ea54c98..12440ec 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -15,6 +15,9 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_PM) += pm_suspend.o
+ifeq ($(CONFIG_CPU_V7),y)
+AFLAGS_pm_suspend.o := -march=armv7-a
+endif
ifeq ($(CONFIG_PM_DEBUG),y)
CFLAGS_pm.o += -DDEBUG
endif