添加控制boot阶段是否引入等待的控制宏:ENABLE_BOOT_WAIT

diff --git a/Makefile b/Makefile
index 5f727f787259089a5d1cecd936895f78cf0a66d2..1712475a07162e3e0dad703585e63efb532283f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ endif
 
 CFLAGS         = -g -c -fno-builtin -m32 -DBUILDER='"$(shell whoami)"'
 CFLAGS     += -DFIX_SYSENTER_ESP_MODE=1
+#CFLAGS     += -DENABLE_BOOT_WAIT=1
 SYSTEMMAP      = System.map
 KERNELBIN      = KERNEL.BIN
 LINKSCRIPT     = scripts/link.ld

diff --git a/boot/boot.c b/boot/boot.c
index 665261108b127d8840043710fa8e8d5e640a77d2..be40f971bbf4982979c8395e8271c99d6e466e18 100644 (file)
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -24,6 +24,7 @@ void init_vbe(void *, void *);
 
 // ticks < 0 代表永远等待
 void boot_delay(int ticks) {
+#if ENABLE_BOOT_WAIT
     char chs[] = {'\\', '-', '/', '-'};
     uint32_t cnt = 0;
 
@@ -43,6 +44,7 @@ void boot_delay(int ticks) {
     }
     asm("cli;");
     printk("\b \b");
+#endif
 }
 
 void init_ttys();