Restructure the bootloader

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index a4c88b392be52822dea6e890cacc9b200b7acdcd..9d1c34475a160d1bb3af2d6fd2ff3f28feb0169e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
 
 all: boot.img
 
-boot.img: boot kernel/kernel.bin
-       cat boot kernel/kernel.bin > $@
+boot.img: boot/x86/boot kernel/kernel.bin
+       cat boot/x86/boot kernel/kernel.bin > $@
        truncate -s1440K $@
 
-boot: boot.s
-       $(AS) -f bin boot.s -o $@
+boot/x86/boot: boot/x86/boot.s boot/x86/a20.s boot/x86/protected.s
+       $(AS) -f bin boot/x86/boot.s -o $@
 
 kernel/kernel.bin: ${KERNEL_OBJ}
        $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
@@ -26,6 +26,6 @@ kernel/kernel.o: kernel/kernel.c
        $(CC) -g -o $@ -Iinclude/arch/x86 -ffreestanding -c kernel/kernel.c
 
 clean:
-       rm boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
+       rm boot/x86/boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
 
 .PHONY: all clean