Logging serial output

2 files changed, 5 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 15051ea..d80a0d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build/
 obj/
 mk.old
 Makefile
+serial.log
+*.swp
diff --git a/Common.mk b/Common.mk
index 3c0b3ef..25c7456 100644
--- a/Common.mk
+++ b/Common.mk
@@ -15,7 +15,7 @@ QEMU = qemu-system-arm
 GDB = gdb-multiarch
 CFLAGS = -mcpu=cortex-a7 -fpic -ffreestanding -std=gnu99 -O3 -Wall -Wextra -nostdlib -g
 AFLAGS = -mcpu=cortex-a7 -g
-QFLAGS = -M raspi2 -cpu arm1176 -m 1G -serial mon:stdio
+QFLAGS = -M raspi2 -cpu arm1176 -m 1G -chardev stdio,id=char0,mux=on,logfile=serial.log,signal=off -serial chardev:char0 -mon chardev=char0
 QFLAGS += -nographic
 
 BSP ?= 2
@@ -60,10 +60,12 @@ obj/%.ao: src/%.S
 
 run: build/kernel.elf
 	@echo Starting QEMU
+	@sleep 2
 	@${QEMU} -kernel $< ${QFLAGS}
 
 run-debug: build/kernel-g.elf
 	@echo Starting QEMU in Debug Mode
+	@sleep 2
 	@${QEMU} -kernel $< -s -S ${QFLAGS}
 
 debug: build/kernel-g.elf build/kernel.list