From 32753f47bf78db55ee0453f6ec11d05d2513245a Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Fri, 18 Jan 2019 17:05:53 +0200 Subject: [PATCH] Add non-docker QEMU --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1eef676..1766086 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,10 @@ UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work QEMU_CMD = qemu-system-aarch64 -M raspi3 -kernel kernel8.img +# -d in_asm,unimp,int -S +QEMU_OPTS = -M raspi3 -d in_asm,int -serial null -serial stdio +QEMU = /usr/local/Cellar/qemu/HEAD-3365de01b5-custom/bin/qemu-system-aarch64 + .PHONY: all qemu clippy clean objdump nm all: clean kernel8.img @@ -45,9 +49,12 @@ kernel8.img: target/$(TARGET)/release/vesper cp $< ./kernel8 $(OBJCOPY) $(OBJCOPY_PARAMS) $< kernel8.img -qemu: all +docker_qemu: all $(DOCKER_CMD) $(UTILS_CONTAINER) $(QEMU_CMD) -d in_asm +qemu: all + $(QEMU) $(QEMU_OPTS) -kernel kernel8.img + clippy: cargo xclippy --target=$(TARGET_JSON)