From 2539aab52fad65a52fd37df0d0dc41282afe4d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 10 Oct 2017 14:27:49 +0200 Subject: Revert "ast-g5: deactivate vbar (for qemu)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f. Support was added to QEMU in : commit 91db4642f868 ("target-arm: Add VBAR support to ARM1176 CPUs") The work around happens to crash the guest when the vector relocation is done, with ignore_memory_transaction_failures=false which is now the default in QEMU. Signed-off-by: Cédric Le Goater Signed-off-by: Andrew Jeffery --- arch/arm/lib/relocate.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 33bcff41ac..475d503dd9 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -35,7 +35,7 @@ ENTRY(relocate_vectors) ldr r1, =V7M_SCB_BASE str r0, [r1, V7M_SCB_VTOR] #else -#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500) +#ifdef CONFIG_HAS_VBAR /* * If the ARM processor has the security extensions, * use VBAR to relocate the exception vectors. -- cgit v1.2.1