Remove magic.bin

diff --git a/.gitignore b/.gitignore
index c69851854689ea0cf434c5659886ea0d78ea09d4..6eb34687357a91dcd4c6b97c79e914fa646020fc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-magic.bin
 nothing.img

diff --git a/Makefile b/Makefile
index 69fc9a6d04e891f4aff9ed8c53af07c37320798a..2a6c1d414f3e0e8a04b24df81cf2ec4ae9ffca68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,13 @@ default_target: vm
 stage1/boot.bin: stage1/boot.asm
        nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm
 
-magic.bin:
-       echo -en "\x55\xAA" > magic.bin
-
 stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs stage2/src/vga.rs
        cd stage2 && cargo build --release
 
-nothing.img: magic.bin stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
+nothing.img: stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
        cp -p base.img nothing.img
        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
+       echo -en "\x55\xAA" | dd of=nothing.img bs=1 seek=510 count=2 conv=notrunc
        dd if=stage2/target/x86-loadnothing/release/stage2 of=nothing.img bs=512 seek=1 conv=notrunc
 
 vm: nothing.img