Init more registers

[loadnothing.git] / Makefile

diff --git a/Makefile b/Makefile
index d3105fc4eaaf6c55e84d4ff6af1135cbf1fab982..d6a4fe5e923143524b49ad836d731b02b057ca7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,18 +7,23 @@ stage1/boot.bin: stage1/boot.asm
 magic.bin:
        echo -en "\x55\xAA" > magic.bin
 
-nothing.img: magic.bin stage1/boot.bin
-       dd if=/dev/zero of=nothing.img bs=2M count=1
+stage2/target/x86_64-loadnothing/debug/stage2: stage2/src/main.rs
+       cd stage2 && cargo build
+
+nothing.img: magic.bin stage1/boot.bin stage2/target/x86_64-loadnothing/debug/stage2
+       dd if=/dev/zero of=nothing.img bs=16M count=1
        parted -s nothing.img mklabel msdos
-       parted -s -a optimal nothing.img mkpart primary fat32 1M 100%
+       parted -s -a optimal nothing.img mkpart primary fat32 256s 100%
        doas losetup /dev/loop1 nothing.img
        doas mkfs.fat /dev/loop1p1
        doas losetup -d /dev/loop1
        dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
        dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
+       dd if=stage2/target/x86_64-loadnothing/debug/stage2 of=nothing.img bs=512 seek=1 conv=notrunc
 
-vm: clean nothing.img
+vm: nothing.img
        qemu-system-x86_64 -hda nothing.img
 
 clean:
        rm -f magic.bin stage1/boot.bin nothing.img
+       cd stage2 && cargo clean