Commit e3d16332 authored Nov 11, 2014 by Arnd Bergmann Committed by Simon Horman Nov 12, 2014

ARM: shmobile: always build rcar setup for armv7



In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot
currently be compiled correctly because it uses the isb
instruction that is not available on ARMv6. Adding the
-march=armv7-a flag lets the compiler know that it is safe
to build this file for ARMv7.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent cad90081

arch/arm/mach-shmobile/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ cpu-y := platsmp.o headsmp.o

	# Shared SoC family objects		# Shared SoC family objects
	obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)		obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
			CFLAGS_setup-rcar-gen2.o += -march=armv7-a

	# SMP objects		# SMP objects
	smp-y := $(cpu-y)		smp-y := $(cpu-y)