1 files changed, 7 insertions, 11 deletions
diff --git a/arch/x86_64/main.c b/arch/x86_64/main.c
index 4a40707..4317c46 100644
--- a/arch/x86_64/main.c
+++ b/arch/x86_64/main.c
@@ -3,17 +3,15 @@
 #include "proc/init.h"
 #include "lib/string.h"
 #include "lib/printf.h"
-#include "lib/virtterm.h"
 #include "panic/panic.h"
 #include "../../hal/obj.h"
 #include "hal/msr.h"
 #include "hal/serial_com.h"
 #include "hal/smp.h"
 #include "hal/memory.h"
-#include "hal/framebuffer.h"
 #include "proc/process.h"
-#include "boot/initrd.h"
-#include "boot/cmdline.h"
+#include "boot/boot.h"
+#include "debug/debug.h"
 
 int errno = 0;
 
@@ -27,22 +25,20 @@ static void kernel_process_entry(void);
 void
 kernel_entry(void)
 {
+    debug_init();
+
     memset(&_rootdir, 0, 0x1000);
     obj_take(_rootdir_obj);
     obj_settype(_rootdir_obj, JOVE_OBJ_OBJDIR);
     obj_setvalue(_rootdir_obj, (uintptr_t)&_rootdir);
+    obj_release(_rootdir_obj);
 
     msr_enable_sse();
 
-    obj_settype(_rootdir_obj, JOVE_OBJ_OBJDIR);
-    serial_com_init();
-
     smp_init_bsp();
-    mem_setup_regions();
 
-    initrd_setup();
-    fb_init();
-    vt_init();
+    mem_setup_modules();
+    mem_setup_regions();
 
     cmdline_print();