summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2018-05-30 17:08:29 +0100
committerManish Pandey <manish.pandey2@arm.com>2018-05-30 17:32:26 +0100
commit5ded27cd0410a7ae7cda295570bf3e5169744829 (patch)
treea6ce2076b4ec28f976efa7caca88109823683c81
parent8c4f17dee5668704eaab77be8859bb87022b48f5 (diff)
Revert "bootwrapper: Fix misaligned Hyp mode vector table"
This reverts commit b9d0f17007e6109cba8760807c3814db57d67bef. Change-Id: I93bc89ade7bd7664d69fd4aa6b209587cdaf8683
-rw-r--r--boot.S24
1 files changed, 12 insertions, 12 deletions
diff --git a/boot.S b/boot.S
index 176be2d..2426c7b 100644
--- a/boot.S
+++ b/boot.S
@@ -12,17 +12,6 @@
.arch_extension virt
.text
-.align 5
-/* Once we get rid of monitor.S, use these smc vectors too! */
-hyp_vectors:
- .word 0 /* reset */
- .word 0 /* undef */
- .word 0 /* svc */
- .word 0 /* pabt */
- .word 0 /* dabt */
- b into_hyp_mode /* hvc */
- .word 0 /* irq */
- .word 0 /* fiq */
.globl start
start:
@@ -79,7 +68,7 @@ start:
mcr p15, 0, r0, c12, c0, 1 @ Monitor vector base address
@ Set up hvbar so hvc comes back here.
- ldr r0, =hyp_vectors
+ ldr r0, =vectors
mov r7, #0xfffffff0
smc #0 @ Set HVBAR
@@ -90,6 +79,17 @@ start:
@ This is how we enter hyp mode, for booting the next stage.
hvc #0
+/* Once we get rid of monitor.S, use these smc vectors too! */
+vectors:
+ .word 0 /* reset */
+ .word 0 /* undef */
+ .word 0 /* svc */
+ .word 0 /* pabt */
+ .word 0 /* dabt */
+ b into_hyp_mode /* hvc */
+ .word 0 /* irq */
+ .word 0 /* fiq */
+
into_hyp_mode:
@ Check CPU nr again
mrc p15, 0, r0, c0, c0, 5 @ MPIDR (ARMv7 only)