X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Farmv7%2Fstart.S;h=8193b31c2edf6c9382ac3a3e29b72e6d368b5600;hb=25398a7f24d189ee7a70fcf0e64827cbc8999028;hp=71534f57784d539492a211e7fd16542e5d1e43de;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/armv7/start.S b/KernelLand/Kernel/arch/armv7/start.S
index 71534f57..8193b31c 100644
--- a/KernelLand/Kernel/arch/armv7/start.S
+++ b/KernelLand/Kernel/arch/armv7/start.S
@@ -67,13 +67,17 @@ _start:
 	@
 	mrc p15, 0, r0, c0, c1, 1
 	and r0, #0xF0
+	beq .no_sec_ext
 	@ - Present
-	ldrne r0,=KERNEL_BASE
-	mcrne p15, 0, r0, c12, c0, 0	@ Set the VBAR (brings exceptions into high memory)
+	ldr r0,=KERNEL_BASE
+	mcr p15, 0, r0, c12, c0, 0	@ Set the VBAR (brings exceptions into high memory)
+	b .exceptions_vectored
+.no_sec_ext:
 	@ - Absent
-	mrceq p15, 0, r0, c1, c0, 0	@ Set SCTLR.V
-	orreq r0, #0x2000
-	mcreq p15, 0, r0, c1, c0, 0
+	mrc p15, 0, r0, c1, c0, 0	@ Set SCTLR.V
+	orr r0, #0x2000
+	mcr p15, 0, r0, c1, c0, 0
+.exceptions_vectored:
 
 	mov r1, #'-'
 	str r1, [r2]