export AS = yasm
-export LD = i686-elf-ld
export CC = i686-elf-gcc
-QEMU = qemu-system-i386
+QEMU = qemu-system-i386 -monitor stdio
GIT_REV = $(shell git rev-parse --short HEAD)
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
+default: kernel/kernel.elf bootloader
all: default boot/x86/disk.img
-run: 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/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
+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}
- $(LD) -o $@ -T kernel/linker.ld ${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/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
+ $(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: default all clean run
+.PHONY: default all clean run bootloader