X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B?a=blobdiff_plain;f=boot%2Fx86%2FMakefile;h=e75e8dc23573c664b7cbeb8de2ab66ae69720b39;hb=da4e7bf5dd2b9448b638255a20ee503b0641e495;hp=0349d2ae8b9d5d1cacb1786f5543b4fcd9544ec3;hpb=dad65146188909b9568ed39b3b3fbc5e88e158c3;p=nameless-os.git

diff --git a/boot/x86/Makefile b/boot/x86/Makefile
index 0349d2a..e75e8dc 100644
--- a/boot/x86/Makefile
+++ b/boot/x86/Makefile
@@ -1,25 +1,27 @@
-default: mbr vbr-fat32 LOADER.BIN
+default: mbr vbr-fat32 stage3/LOADER.BIN stage3/loader.elf
 
-all: mbr vbr-fat32 LOADER.BIN disk.img
+CFLAGS=-g -ffreestanding -Istage3
+LD=i686-elf-gcc
+LDFLAGS=-T stage3/stage3.ld -ffreestanding -nostdlib -g
+
+STAGE3_OBJ=stage3/loader.o stage3/paging.o stage3/elf.o stage3/prekernel.o
 
 mbr: mbr.s
 	$(AS) $(ASFLAGS) -w-zeroing -o $@ $<
 
-vbr-fat32: vbr-fat32.s fat32.s fat32-structs.s
+vbr-fat32: vbr-fat32.s fat32/*.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
-LOADER.BIN: loader.s
-	$(AS) $(ASFLAGS) -o $@ $<
+stage3/loader.elf: $(STAGE3_OBJ)
+	$(CC) $(LDFLAGS) -o $@ $^ -lgcc -Wl,--oformat=elf32-i386
+
+stage3/LOADER.BIN: $(STAGE3_OBJ)
+	$(CC) $(LDFLAGS) -o $@ $^ -lgcc
 
-disk.img: mbr vbr-fat32 LOADER.BIN disk.dump
-	truncate -s100M disk.img
-	sfdisk disk.img < disk.dump
-	mkfs.fat -F 32 --offset 2048 disk.img
-	dd if=mbr of=disk.img bs=440 count=1 conv=notrunc
-	dd if=vbr-fat32 of=disk.img bs=1 skip=90 seek=1048666 conv=notrunc
-	mcopy -i disk.img@@1M LOADER.BIN ::.
+stage3/loader.o: stage3/loader.s stage3/*.s
+	$(AS) $(ASFLAGS) -f elf -g dwarf2 -DGIT_REVISION=\"$(GIT_REV)\" -o $@ $<
 
 clean:
-	-rm mbr vbr-fat32 LOADER.BIN disk.img
+	-rm mbr vbr-fat32 stage3/LOADER.BIN stage3/loader.elf $(STAGE3_OBJ) disk.img
 
-.PHONY : default all clean
+.PHONY : default clean