A version that works both on k210 and qemu.

HUST-OS · Mar 5, 2021 · 9b0bf37 · 9b0bf37
1 parent bdf8eb0
commit 9b0bf37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-# platform	:= k210
-platform	:= qemu
-mode := debug
-#mode := release
+platform	:= k210
+# platform	:= qemu
+# mode := debug
+mode := release
 K=kernel
 U=xv6-user
 T=target

diff --git a/kernel/.sdcard.c.swp b/kernel/.sdcard.c.swp
diff --git a/kernel/main.c b/kernel/main.c
@@ -43,9 +43,6 @@ main(unsigned long hartid, unsigned long dtb_pa)
     #endif 
 
     disk_init();
-    #ifndef QEMU
-    test_sdcard();
-    #endif
 
     binit();         // buffer cache
     fileinit();      // file table
@@ -72,7 +69,7 @@ main(unsigned long hartid, unsigned long dtb_pa)
     #ifndef QEMU
     device_init(dtb_pa, hartid);
     #else
-    //plicinithart();  // ask PLIC for device interrupts
+    plicinithart();  // ask PLIC for device interrupts
     #endif
     printf("hart 1 init done\n");
   }