Fixes and improvements to FAT32 driver

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index c895701d2b911f6517b90be5d4b4fd8cbea6cfcb..d3f2ee4be49cbe23808b4d7813da6965cb51ed2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,46 @@
-AS = yasm
-LD = i686-elf-ld
-CC = i686-elf-gcc
+export AS = yasm
+export LD = i686-elf-ld
+export CC = i686-elf-gcc
+QEMU = qemu-system-i386
 
-KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
+GIT_REV = $(shell git rev-parse --short HEAD)
 
-all: boot.img
+CFLAGS = -std=gnu89 -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
 
-boot.img: boot kernel/kernel.bin
-       cat 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
 
-boot: boot.s
-       $(AS) -f bin boot.s -o $@
+default: kernel/kernel.elf
+
+all: default boot/x86/disk.img
+
+run: boot/x86/disk.img
+       $(QEMU) boot/x86/disk.img
+
+boot/x86/disk.img: boot/x86/mbr.s boot/x86/vbr-fat32.s boot/x86/loader.s boot/x86/disk.dump boot/x86/fat32.s boot/x86/fat32-structs.s
+       cd boot/x86 && $(MAKE) all
 
 kernel/kernel.bin: ${KERNEL_OBJ}
-       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
+       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
 
 kernel/entry.o: kernel/entry.s
        $(AS) -f elf kernel/entry.s -o $@
 
 kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
-       $(CC) -o $@ -ffreestanding -c kernel/arch/x86/tty/tty.c
+
+kernel/drivers/irq/i8259a.o: kernel/drivers/irq/i8259a.c
+
+kernel/arch/x86/irq/idt.o: kernel/arch/x86/irq/idt.c
+
+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.o: kernel/kernel.c
-       $(CC) -o $@ -Iinclude/arch/x86 -ffreestanding -c kernel/kernel.c
+
+kernel/kernel.elf: kernel/kernel.bin
+       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=elf32-i386
 
 clean:
-       rm boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
+       -rm kernel/kernel.bin kernel/kernel.elf ${KERNEL_OBJ}
+       cd boot/x86 && $(MAKE) clean
 
-.PHONY: all clean
+.PHONY: default all clean run