From acef5262ebe087e6795160b376836e7d1df53f12 Mon Sep 17 00:00:00 2001
From: Ain <41307858+nero@users.noreply.github.com>
Date: Sun, 21 Apr 2019 10:14:06 +0000
Subject: [PATCH] Reduce amount of scripts in root directory

---
 Makefile                         | 25 +++++++++++++++++++++++--
 run-floppy.sh                    |  2 --
 run-pxe.sh                       |  5 -----
 fix-rom.sh => scripts/fix-rom.sh |  0
 4 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100755 run-floppy.sh
 delete mode 100755 run-pxe.sh
 rename fix-rom.sh => scripts/fix-rom.sh (100%)

diff --git a/Makefile b/Makefile
index b0a9026..0ef3df2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,25 @@ FD_CYLINDERS = 40
 FD_HEADS = 2
 FD_SECTORS = 9
 
+QEMU_ARCH = $(shell uname -m)
+QEMU = qemu-system-$(QEMU_ARCH)
+QEMU_ARGS =
+
+ifdef KVM
+QEMU_ARGS += --enable-kvm
+endif
+
+ifdef DEBUG
+QEMU_ARGS += -chardev file,path=debugcon.log,id=seabios
+QEMI_ARGS += -device isa-debugcon,iobase=0x402,chardev=seabios
+endif
+
+.PHONY: default clean qemu-rom qemu-floppy
+
 default: kernel.rom
 
 kernel.rom: kernel/*.asm
-	nasm -s -o $@ -I kernel kernel/main.asm && ./fix-rom.sh $@
+	nasm -s -o $@ -I kernel kernel/main.asm && scripts/fix-rom.sh $@
 
 boot/%.bin: boot/%.asm
 	nasm -s -o $@ -I lib $<
@@ -16,4 +31,10 @@ fdimage.img: boot/floppy.bin kernel.rom
 	mcopy -i $@ kernel.rom ::kernel.rom
 
 clean:
-	rm -f *.com *.bin *.rom *.img boot/*.bin
+	rm -f *.com *.bin *.rom *.img *.log boot/*.bin
+
+qemu-rom: kernel.rom
+	$(QEMU) $(QEMU_ARGS) -option-rom kernel.rom
+
+qemu-floppy: fdimage.img
+	$(QEMU) $(QEMU_ARGS) -boot c -hda fdimage.img
\ No newline at end of file
diff --git a/run-floppy.sh b/run-floppy.sh
deleted file mode 100755
index ac2b4db..0000000
--- a/run-floppy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec qemu-system-x86_64 -hda fdimage.img
diff --git a/run-pxe.sh b/run-pxe.sh
deleted file mode 100755
index 1bd108f..0000000
--- a/run-pxe.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-exec qemu-system-x86_64 -boot n \
-	-option-rom /usr/share/qemu/pxe-rtl8139.rom \
-	-device e1000,netdev=mynet0,mac=52:54:00:12:34:56 \
-	-netdev user,id=mynet0,net=192.168.76.0/24,dhcpstart=192.168.76.9,tftp=$PWD,bootfile=kernel.com
diff --git a/fix-rom.sh b/scripts/fix-rom.sh
similarity index 100%
rename from fix-rom.sh
rename to scripts/fix-rom.sh