X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=blobdiff_plain;f=Makefile;h=502430a15416276d15b523929b7ec878ba26867b;hb=refs%2Fheads%2Fmm;hp=d3f2ee4be49cbe23808b4d7813da6965cb51ed2e;hpb=dad65146188909b9568ed39b3b3fbc5e88e158c3;p=nameless-os.git

diff --git a/Makefile b/Makefile
index d3f2ee4..502430a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,40 @@
+export CROSS_COMPILE = i686-elf-
 export AS = yasm
-export LD = i686-elf-ld
-export CC = i686-elf-gcc
-QEMU = qemu-system-i386
-
-GIT_REV = $(shell git rev-parse --short HEAD)
-
-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
-
+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
+
+default: kernel/kernel.elf bootloader
 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}
-
-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
-
-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
-
-kernel/kernel.elf: kernel/kernel.bin
-	$(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=elf32-i386
+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
+
+kernel/kernel.elf:
+	$(MAKE) -C kernel
+bootloader:
+	$(MAKE) -C boot/x86
+
+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
 
 clean:
-	-rm kernel/kernel.bin kernel/kernel.elf ${KERNEL_OBJ}
-	cd boot/x86 && $(MAKE) clean
+	$(MAKE) -C boot/x86 clean
+	$(MAKE) -C kernel clean
 
-.PHONY: default all clean run
+# 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