-kernel/kernel.bin: kernel/entry.o kernel/kernel.o
- $(LD) -o $@ -Ttext 0x1000 kernel/entry.o kernel/kernel.o --oformat=binary
+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
+
+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
+
+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}