X-Git-Url: http://git.dujemihanovic.xyz/projects?a=blobdiff_plain;f=Makefile;h=738fb0c89192daa87e3ca2a3c2e65e1b6a43fcd7;hb=5138270e466cf2dd21bf0aa6356672fdcc85fee6;hp=9d95b1ef97134bcebc837fe4ab4cfab1e6fff45a;hpb=73dce672626ceb415b49ff059092c48a2f7c3de3;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 9d95b1e..738fb0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,52 @@
-AS = yasm # choose yasm or nasm here
-ASFLAGS = -f bin # compile a raw binary
+export AS = yasm
+export CC = i686-elf-gcc
+QEMU = qemu-system-i386 -monitor stdio
 
-boot: boot.s print.s
-	$(AS) $(ASFLAGS) -o $@ boot.s
+GIT_REV = $(shell git rev-parse --short HEAD)
 
-clean:
-	-rm boot
+CFLAGS = -std=gnu89 -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
+
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
+
+default: kernel/kernel.elf bootloader
+
+all: default boot/x86/disk.img
+
+bootloader: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN
+
+run: all
+	$(QEMU) boot/x86/disk.img
 
-run:
-	qemu-system-i386 boot
+boot/x86/mbr: boot/x86/mbr.s
+	$(MAKE) -C boot/x86
+boot/x86/vbr-fat32: boot/x86/vbr-fat32.s boot/x86/fat32/*.s 
+	$(MAKE) -C boot/x86
+boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/fat32/*.s
+	$(MAKE) -C boot/x86
 
-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)."
+boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump 
+	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.bin ::./KERNEL.BIN
+
+kernel/kernel.bin: ${KERNEL_OBJ}
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
+
+kernel/entry.o: kernel/entry.s
+	$(AS) -f elf kernel/entry.s -o $@
+
+kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
+	$(CC) $(CFLAGS) -mgeneral-regs-only -c kernel/arch/x86/irq/sample_handler.c -o $@
+
+kernel/kernel.elf: kernel/kernel.bin
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -Wl,--oformat=elf32-i386
+
+clean:
+	-rm kernel/kernel.bin kernel/kernel.elf ${KERNEL_OBJ}
+	cd boot/x86 && $(MAKE) clean
 
-.PHONY = clean run help
+.PHONY: default all clean run bootloader