summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--grub.cfg2
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1d5571a..666c226 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/grub.cfg b/grub.cfg
index ab0a41d..5f66c18 100644
--- a/grub.cfg
+++ b/grub.cfg
@@ -1,3 +1,5 @@
+set timeout=0
+
menuentry "Camellia" {
multiboot /boot/kernel.bin
}