diff options
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | grub.cfg | 2 |
2 files changed, 6 insertions, 4 deletions
@@ -31,11 +31,11 @@ out/obj/%.c.o: src/%.c .PHONY: boot debug lint clean -boot: out/fs/boot/kernel.bin - qemu-system-i386 -kernel $< $(QFLAGS) -no-shutdown +boot: out/boot.iso + qemu-system-i386 $< $(QFLAGS) -no-shutdown -debug: out/fs/boot/kernel.bin - qemu-system-i386 -kernel $< $(QFLAGS) -s -S & +debug: out/boot.iso + qemu-system-i386 $< $(QFLAGS) -s -S & sleep 1 gdb @@ -1,3 +1,5 @@ +set timeout=0 + menuentry "Camellia" { multiboot /boot/kernel.bin } |