aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot.S7
-rw-r--r--src/sys/kernel.S2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/boot.S b/src/boot.S
index 6da500b..46ef3d0 100644
--- a/src/boot.S
+++ b/src/boot.S
@@ -9,13 +9,20 @@
_start:
reset:
cpsid aif
+
+ // Exit Hypervisor Mode
mrs r0, cpsr
+ and r1, r0, #0x1F
+ cmp r1, #0x1A
+ bne 1f
bic r0, r0, #0x1f
orr r0, r0, #0x13
msr spsr_cxsf, r0
add r0, pc, #4
msr ELR_hyp, r0
eret
+
+1:
// disable core0,1,2.
mrc p15, #0, r1, c0, c0, #5
and r1, r1, #3
diff --git a/src/sys/kernel.S b/src/sys/kernel.S
index cfd396f..654a9a7 100644
--- a/src/sys/kernel.S
+++ b/src/sys/kernel.S
@@ -10,7 +10,7 @@ kernel_main:
bl sysinit
// Intentional undefined instruction
- //.word 0xf7f0a000
+ // .word 0xf7f0a000
cpsie aif, #0x10
svc #2 // Start scheduling!
1: