Commit c7edd7f9 authored Feb 19, 2016 by Jean-Philippe Brucker Committed by Russell King Feb 22, 2016

ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs



ARMv6 CPUs do not have virtualisation extensions, but hyp-stub.S is
still included into the image to keep it generic. In order to use ARMv7
instructions during HYP initialisation, add -march=armv7-a flag to
hyp-stub's build.

On an ARMv6 CPU, __hyp_stub_install returns as soon as it detects that
the mode isn't HYP, so we will never reach those instructions.

Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent e972c374

arch/arm/boot/compressed/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -195,5 +195,7 @@ CFLAGS_font.o := -Dstatic=
		$(obj)/font.c: $(FONTC)
		$(call cmd,shipped)

		AFLAGS_hyp-stub.o := -Wa,-march=armv7-a

		$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S
		$(call cmd,shipped)

arch/arm/kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ obj-$(CONFIG_DEBUG_LL) += debug.o
		obj-$(CONFIG_EARLY_PRINTK) += early_printk.o

		obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
		AFLAGS_hyp-stub.o :=-Wa,-march=armv7-a
		ifeq ($(CONFIG_ARM_PSCI),y)
		obj-$(CONFIG_SMP) += psci_smp.o
		endif

Admin message