diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | limine.conf | 14 |
2 files changed, 7 insertions, 10 deletions
@@ -146,8 +146,7 @@ clean: run: iso @echo "[yerba] booting in QEMU..." - # qemu-system-x86_64 -kernel $(BUILD_DIR)/bzImage -initrd $(BUILD_DIR)/initramfs.cpio.gz -nographic -append "console=ttyS0" - qemu-system-x86_64 -cdrom $(ISO_PATH) -m 2G -cpu host -enable-kvm + qemu-system-x86_64 -cdrom $(ISO_PATH) -m 2G -cpu host -enable-kvm -vga std setup: $(LINUX_DIR) $(LIMINE_DIR) $(BUSYBOX_DIR) @echo "[yerba] all repos fetched" diff --git a/limine.conf b/limine.conf index eedad60..65d96ce 100644 --- a/limine.conf +++ b/limine.conf @@ -1,9 +1,7 @@ -TIMEOUT=5 +timeout: 5 -DEFAULT=yerba-linux - -:yerba-linux - PROTOCOL=linux - KERNEL_PATH=boot:///boot/bzImage - INITRD_PATH=boot:///boot/initramfs.cpio.gz - CMDLINE=console=ttyS0 +/Yerba-Linux + protocol: linux + kernel_path: boot():/boot/bzImage + module_path: boot():/boot/initramfs.cpio.gz + cmdline: console=ttyS0 console=tty0 |