summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCédric Le Goater <clg@kaod.org>2016-07-13 16:27:36 +0200
committerJoel Stanley <joel@jms.id.au>2016-07-27 15:44:01 +0930
commita0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f (patch)
tree480279626f2a8f295983b821ae3fd4dc139e505e /arch
parent8dc547ba50e3ee371bd9196843f716387f29d675 (diff)
downloadblackbird-obmc-uboot-a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.tar.gz
blackbird-obmc-uboot-a0ca4ecbeae4ae9632ebc67bf5318dd2ea09c94f.zip
ast-g5: deactivate vbar (for qemu)
This is work around for the ast2500 qemu guest which does not handle the vbar yet. Signed-off-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/lib/relocate.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 475d503dd9..33bcff41ac 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
-#ifdef CONFIG_HAS_VBAR
+#if defined(CONFIG_HAS_VBAR) && !defined(CONFIG_ARCH_AST2500)
/*
* If the ARM processor has the security extensions,
* use VBAR to relocate the exception vectors.
OpenPOWER on IntegriCloud