From: Nicolas Pitre Date: Mon, 9 Sep 2013 16:31:04 +0000 (-0400) Subject: ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build X-Git-Tag: upstream/snapshot3+hdmi~4316^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c78d113fb9bdb50d60519a8b5d7f56cd1a50a8f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build This fixes the following build error: /tmp/cce439dZ.s: Assembler messages: /tmp/cce439dZ.s:506: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:512: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:513: Error: selected processor does not support ARM mode `dsb ' /tmp/cce439dZ.s:583: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:589: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:590: Error: selected processor does not support ARM mode `dsb ' Tested-by: Guenter Roeck Signed-off-by: Nicolas Pitre Tested-by: Kevin Hilman Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile index 36ea824..505e64a 100644 --- a/arch/arm/mach-vexpress/Makefile +++ b/arch/arm/mach-vexpress/Makefile @@ -7,6 +7,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ obj-y := v2m.o obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o +CFLAGS_dcscb.o += -march=armv7-a obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o spc.o +CFLAGS_tc2_pm.o += -march=armv7-a obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o