VESA support

[nyax.git] / Makefile

diff --git a/Makefile b/Makefile
index 193a19b187b547d189a1f06a351289d11072d8f3..850f293e338f4d09349b9a2a6fdcdf4addca5875 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
 OBJS = main.o framebuffer.o memory.o
+DEV=/dev/sdb
 
-nyax.img: boot.out main.out
-       cat boot.out main.out > nyax.img
+nyax.img: stage1.out stage2.out stage3.out
+       cat stage{1,2,3}.out > nyax.img
 
-boot.out: boot.asm main.out
-       nasm -f bin boot.asm -o boot.out -dMAIN_SIZE=$$(stat -c%s main.out)
+stage1.out: mbr.asm stage2.out stage3.out
+       nasm -f bin mbr.asm -o stage1.out \
+               -dKSIZE=$$(du -cb stage{2,3}.out | tail -n1 | cut -f1)
 
-main.out: $(OBJS)
-       ld -o main.out -Ttext 0xD000 --oformat binary $(OBJS)
+stage2.out: setup.asm
+       nasm -f bin setup.asm -o stage2.out
+
+stage3.out: $(OBJS) stage2.out
+       ld -o stage3.out --oformat binary $(OBJS) \
+               -Ttext $$(printf "%x\n" $$(echo $$(du -b stage2.out | cut -f1)+32256 | bc))
 
 %.o: %.asm
        nasm -f elf64 $< -o $@
@@ -19,3 +25,6 @@ run: nyax.img
 .PHONY: clean
 clean:
        rm -rf *.o *.out *.img
+
+flash: nyax.img
+       dd if=./nyax.img of=$(DEV)