X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B?a=blobdiff_plain;f=Makefile;h=502430a15416276d15b523929b7ec878ba26867b;hb=refs%2Fheads%2Fmm;hp=9d95b1ef97134bcebc837fe4ab4cfab1e6fff45a;hpb=73dce672626ceb415b49ff059092c48a2f7c3de3;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 9d95b1e..502430a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,40 @@
-AS = yasm # choose yasm or nasm here
-ASFLAGS = -f bin # compile a raw binary
+export CROSS_COMPILE = i686-elf-
+export AS = yasm
+export CC = gcc
+export QEMU = qemu-system-i386 -monitor stdio -cpu pentium2
+export GIT_REV = $(shell git describe --long HEAD)
+export REAL_CC = $(CROSS_COMPILE)$(CC)
+export CFLAGS
+export LDFLAGS
+export ASFLAGS
+MAKEFLAGS += -rR
 
-boot: boot.s print.s
-	$(AS) $(ASFLAGS) -o $@ boot.s
+default: kernel/kernel.elf bootloader
+all: default boot/x86/disk.img
+run: all
+	$(QEMU) -drive file=boot/x86/disk.img,format=raw,throttling.iops-total=100
+debug: all
+	$(QEMU) -s -S -drive file=boot/x86/disk.img,format=raw,throttling.iops-total=100
 
-clean:
-	-rm boot
+kernel/kernel.elf:
+	$(MAKE) -C kernel
+bootloader:
+	$(MAKE) -C boot/x86
 
-run:
-	qemu-system-i386 boot
+boot/x86/disk.img: bootloader boot/x86/disk.dump kernel/kernel.elf
+	truncate -s1G boot/x86/disk.img
+	sfdisk boot/x86/disk.img < boot/x86/disk.dump
+	mkfs.fat -F 32 --offset 2048 boot/x86/disk.img
+	dd if=boot/x86/mbr of=boot/x86/disk.img bs=440 count=1 conv=notrunc
+	dd if=boot/x86/vbr-fat32 of=boot/x86/disk.img bs=1 skip=90 seek=1048666 conv=notrunc
+	mcopy -i boot/x86/disk.img@@1M boot/x86/stage3/LOADER.BIN ::.
+	mcopy -i boot/x86/disk.img@@1M kernel/kernel.elf ::./KERNEL.ELF
 
-help:
-	@echo "Run 'make' to compile."
-	@echo "Run 'make clean' to delete compiled objects."
-	@echo "Run 'make run' to run the compiled object. Must have qemu-system-i386 (but x86_64 should work too)."
+clean:
+	$(MAKE) -C boot/x86 clean
+	$(MAKE) -C kernel clean
 
-.PHONY = clean run help
+# Even though kernel.elf is a real target, it's considered phony so that the
+# kernel Makefile is always run. We don't check is the kernel binary up-to-date
+# here because we want to be more recursive.
+.PHONY: default all clean run debug bootloader kernel/kernel.elf