From 92456c92b6da38110df60785a563b30c7108190a Mon Sep 17 00:00:00 2001
From: Joursoir <chat@joursoir.net>
Date: Tue, 28 Sep 2021 23:03:02 +0000
Subject: x86/boot/makefile: compile two-stage bootloader

---
 arch/x86/boot/Makefile | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 0501ab3..e026e24 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -1,27 +1,39 @@
 # If you want run this makefile immediately, then set environment
 # variables (CC, LD, AS, OBJDUMP) to path of your cross-compiler.
 #
-# The best way to compile bootsect.bin is to run the corresponding
+# The best way to compile $BOOTBIN is to run the corresponding
 # target in the main Makefile, which is in the root of the
 # project (.../path/to/os/Makefile)
 
-BOOTBIN = bootsect.bin
+BOOTBIN = bootloader.bin
 
 .PHONY: all objdump clean
 
 all: $(BOOTBIN)
 
-$(BOOTBIN): bootsect.o
-	$(CC) -T linker.ld -o $(BOOTBIN) \
+$(BOOTBIN): bootsect.bin setup.bin
+	cat $^ > $@
+
+bootsect.bin: bootsect.o
+	$(CC) -Wl,--oformat binary -Ttext 0x7c00 -o $@ \
+		-ffreestanding -nostdlib \
+		$^ -lgcc
+
+setup.bin: setup.o
+	$(CC) -Wl,--oformat binary -Ttext 0x0200 -o $@ \
 		-ffreestanding -nostdlib \
 		$^ -lgcc
 
-bootsect.o: bootsect.s
+%.o: %.s
 	$(AS) $< -o $@
 
-objdump:
+objdump-bootsect:
+	$(OBJDUMP) -D -m i386 -b binary \
+		--adjust-vma=0x7c00 -Maddr16,data16 bootsect.bin
+
+objdump-setup:
 	$(OBJDUMP) -D -m i386 -b binary \
-		--adjust-vma=0x7c00 -Maddr16,data16 $(BOOTBIN)
+		--adjust-vma=0x2000 -Maddr16,data16 setup.bin
 
 clean:
-	rm -rf bootsect.o $(BOOTBIN)
+	rm -rf bootsect.o setup.o $(BOOTBIN)
-- 
cgit v1.2.3-18-g5258