try to pass the fmt and source and license check

rel4team · Jul 14, 2024 · 03a47c9 · 03a47c9
1 parent b71273f
commit 03a47c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 28 deletions.
diff --git a/crates/sel4-kernel-loader/src/arch/arm/arch/aarch64/mod.rs b/crates/sel4-kernel-loader/src/arch/arm/arch/aarch64/mod.rs
@@ -69,19 +69,19 @@ impl Arch for ArchImpl {
         unsafe {
             set_tpidr(core_id);
         }
-
-        unsafe {
-            drop_to_el1();
-        }
-        current_el = get_current_el();
-        assert!(current_el == Some(CurrentEL::EL::Value::EL1));
-
-        // unsafe {
-        //     switch_translation_tables_el2();
-        // }
-
-        unsafe {
-            switch_translation_tables_el1();
+        if sel4_cfg_bool!(ARM_HYPERVISOR_SUPPORT) {
+            unsafe {
+                switch_translation_tables_el2();
+            }
+        } else {
+            unsafe {
+                drop_to_el1();
+            }
+            current_el = get_current_el();
+            assert!(current_el == Some(CurrentEL::EL::Value::EL1));
+            unsafe {
+                switch_translation_tables_el1();
+            }
         }
 
         (kernel_entry)(

diff --git a/install_kernel_loader.sh b/install_kernel_loader.sh