X-Git-Url: http://git.dujemihanovic.xyz/posts?a=blobdiff_plain;f=Makefile;h=aee8cc187a36d118823f8b1e66abedbbd4a99d87;hb=HEAD;hp=9d1c34475a160d1bb3af2d6fd2ff3f28feb0169e;hpb=63853960825f007827a79f704d291c372c807096;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 9d1c344..aee8cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,55 @@
-AS = yasm
-LD = i686-elf-ld
-CC = i686-elf-gcc
+export AS = yasm
+export CC = i686-elf-gcc
+QEMU = qemu-system-i386 -monitor stdio
 
-KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
+export GIT_REV = $(shell git describe --long HEAD)
 
-all: boot.img
+CFLAGS = -std=gnu89 -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
 
-boot.img: boot/x86/boot kernel/kernel.bin
-	cat boot/x86/boot kernel/kernel.bin > $@
-	truncate -s1440K $@
+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
+BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN
 
-boot/x86/boot: boot/x86/boot.s boot/x86/a20.s boot/x86/protected.s
-	$(AS) -f bin boot/x86/boot.s -o $@
+default: kernel/kernel.elf bootloader
 
-kernel/kernel.bin: ${KERNEL_OBJ}
-	$(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
+all: default boot/x86/disk.img
+
+bootloader: $(BOOTLOADER_OBJ)
+
+run: all
+	$(QEMU) boot/x86/disk.img
+
+boot/x86/mbr: boot/x86/mbr.s
+boot/x86/vbr-fat32: boot/x86/vbr-fat32.s boot/x86/fat32/*.s 
+boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/fat32/*.s
+$(BOOTLOADER_OBJ):
+	$(MAKE) -C boot/x86
+
+boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump kernel/kernel.bin
+	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} kernel/linker.ld
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
 
 kernel/entry.o: kernel/entry.s
-	$(AS) -f elf kernel/entry.s -o $@
+	$(AS) -f elf $< -o $@
 
-kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
-	$(CC) -g -o $@ -ffreestanding -c kernel/arch/x86/tty/tty.c
+kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
+	$(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
 
-kernel/kernel.o: kernel/kernel.c
-	$(CC) -g -o $@ -Iinclude/arch/x86 -ffreestanding -c kernel/kernel.c
+kernel/kernel.elf: kernel/kernel.bin
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -Wl,--oformat=elf32-i386
+	i686-elf-objcopy --only-keep-debug kernel/kernel.elf kernel/kernel.dbg
+	i686-elf-objcopy --add-gnu-debuglink=kernel/kernel.dbg kernel/kernel.elf
+	i686-elf-strip --strip-unneeded kernel/kernel.elf
 
 clean:
-	rm boot/x86/boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
+	-rm kernel/kernel.{bin,dbg,elf} ${KERNEL_OBJ}
+	cd boot/x86 && $(MAKE) clean
 
-.PHONY: all clean
+.PHONY: default all clean run bootloader