|
@@ -21,15 +21,19 @@ KERNEL_SOURCES := $(shell find src macros crates -name '*.rs' -type f)
|
|
|
KERNEL_CARGO_MANIFESTS += $(shell find src macros crates -name Cargo.toml -type f)
|
|
KERNEL_CARGO_MANIFESTS += $(shell find src macros crates -name Cargo.toml -type f)
|
|
|
KERNEL_DEPS := $(KERNEL_SOURCES) $(KERNEL_CARGO_MANIFESTS)
|
|
KERNEL_DEPS := $(KERNEL_SOURCES) $(KERNEL_CARGO_MANIFESTS)
|
|
|
|
|
|
|
|
-QEMU_ARGS ?= -no-reboot -no-shutdown
|
|
|
|
|
|
|
+QEMU_ARGS ?= -no-reboot
|
|
|
CARGO_FLAGS := --profile $(PROFILE) --features $(FEATURES)$(if $(SMP),$(COMMA)smp,)
|
|
CARGO_FLAGS := --profile $(PROFILE) --features $(FEATURES)$(if $(SMP),$(COMMA)smp,)
|
|
|
|
|
|
|
|
ifeq ($(HOST),darwin)
|
|
ifeq ($(HOST),darwin)
|
|
|
QEMU_ACCEL ?= -accel tcg
|
|
QEMU_ACCEL ?= -accel tcg
|
|
|
else ifeq ($(HOST),linux)
|
|
else ifeq ($(HOST),linux)
|
|
|
|
|
+
|
|
|
|
|
+ifeq ($(shell ls /dev/kvm),/dev/kvm)
|
|
|
QEMU_ACCEL ?= -accel kvm
|
|
QEMU_ACCEL ?= -accel kvm
|
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
|
|
+endif
|
|
|
|
|
+
|
|
|
QEMU_ARGS += $(QEMU_ACCEL)
|
|
QEMU_ARGS += $(QEMU_ACCEL)
|
|
|
|
|
|
|
|
ifneq ($(DEBUG_TRAPS),)
|
|
ifneq ($(DEBUG_TRAPS),)
|
|
@@ -122,6 +126,10 @@ run: build build/kernel.sym
|
|
|
srun: build build/kernel.sym
|
|
srun: build build/kernel.sym
|
|
|
$(QEMU) $(QEMU_ARGS) -display none -S -s -serial mon:stdio
|
|
$(QEMU) $(QEMU_ARGS) -display none -S -s -serial mon:stdio
|
|
|
|
|
|
|
|
|
|
+.PHONY: test-run
|
|
|
|
|
+test-run: build
|
|
|
|
|
+ $(QEMU) $(QEMU_ARGS) -display none -serial stdio
|
|
|
|
|
+
|
|
|
.PHONY: clean
|
|
.PHONY: clean
|
|
|
clean:
|
|
clean:
|
|
|
-rm -rf build
|
|
-rm -rf build
|