feat: misc
Nicer kernel, now can fetch multiboot2 boot info
This commit is contained in:
8
Makefile
8
Makefile
@@ -7,9 +7,11 @@ RUST_DEP := Cargo.toml Cargo.lock $(shell find .cargo -type f) $(shell find deps
|
||||
|
||||
KERNELFILE = $(OXIDE_MULTIBOOT)
|
||||
$(KERNELFILE): $(shell find members/oxide -type f) $(RUST_DEP)
|
||||
cargo b -r --target=.cargo/target-protected-i386.json --package oxide
|
||||
cargo b -r --package oxide
|
||||
|
||||
BOOTLOADER ?= grub
|
||||
# Must not contain '/' with current limitations
|
||||
CMDLINE ?=
|
||||
include mk/make_bootloader/$(BOOTLOADER).mk
|
||||
|
||||
.PHONY: clean \
|
||||
@@ -24,6 +26,6 @@ run-bootloader-qemu-nographic: $(OUTIMG)
|
||||
qemu-system-x86_64 -nographic -drive format=raw,file=$(OUTIMG)
|
||||
# one day qemu will support multiboot2
|
||||
run-qemu: $(KERNELFILE)
|
||||
qemu-system-x86_64 -kernel $(KERNELFILE)
|
||||
qemu-system-x86_64 -kernel $(KERNELFILE) -append $(CMDLINE)
|
||||
run-qemu-nographic: $(KERNELFILE)
|
||||
qemu-system-x86_64 -nographic -kernel $(KERNELFILE)
|
||||
qemu-system-x86_64 -nographic -kernel $(KERNELFILE) -append $(CMDLINE)
|
||||
|
||||
Reference in New Issue
Block a user