Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / aarch64 / boot / init.c

diff --git a/lunaix-os/arch/aarch64/boot/init.c b/lunaix-os/arch/aarch64/boot/init.c
index 06b29802bcf45dd018fce6ff46deccc41bfa7034..d10675e60ea616ebd49241e3807c447c3419b19e 100644 (file)
--- a/lunaix-os/arch/aarch64/boot/init.c
+++ b/lunaix-os/arch/aarch64/boot/init.c
@@ -1,5 +1,5 @@
 #include <lunaix/boot_generic.h>
 #include <lunaix/boot_generic.h>

-#include <asm/aa64_msrs.h>
+#include <asm/aa64.h>

 
 #include "init.h"
 
 
 #include "init.h"
 


@@ -27,10 +27,12 @@ setup_pstate()
    set_sysreg(SPSel, 1);
 }
 
    set_sysreg(SPSel, 1);
 }
 

+extern void aa64_vbase();
+

 static inline void
 setup_evbar()
 {
 static inline void
 setup_evbar()
 {

-    // TODO install exception vectors, setup VBAR
+    set_sysreg(VBAR_EL1, __ptr(aa64_vbase));

 }
 
 static inline void
 }
 
 static inline void