diff options
| author | Cédric Le Goater <clg@kaod.org> | 2017-10-10 14:27:49 +0200 |
|---|---|---|
| committer | Andrew Jeffery <andrew@aj.id.au> | 2017-10-21 00:24:55 +1030 |
| commit | 2539aab52fad65a52fd37df0d0dc41282afe4d04 (patch) | |
| tree | e8719e7cfeb8282da8befed4a9a54d20b5d1fa0a | |
| parent | 1b3fb9515dcd280fca764b2521f152ca04d04701 (diff) | |
| download | talos-obmc-uboot-2539aab52fad65a52fd37df0d0dc41282afe4d04.tar.gz talos-obmc-uboot-2539aab52fad65a52fd37df0d0dc41282afe4d04.zip | |
Revert "ast-g5: deactivate vbar (for qemu)"
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 <clg@kaod.org>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
| -rw-r--r-- | arch/arm/lib/relocate.S | 2 |
1 files changed, 1 insertions, 1 deletions
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. |
