diff options
| author | Marvin Borner | 2019-11-09 19:13:55 +0100 |
|---|---|---|
| committer | Marvin Borner | 2019-11-09 19:13:55 +0100 |
| commit | a30a9b21c3e0af7996a551381a8f41075bada7ad (patch) | |
| tree | e20309a87c03c3d3473aaf181c4671b53dfd01d9 /Makefile | |
| parent | 5f0475e159428e50e58f3772d6a759ff86b7b55a (diff) | |
Started own implementation of asm bootloader
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -40,7 +40,9 @@ build: clean # Create ISO mkdir -p ./iso/boot/; \ mv ./build/melvix.bin ./iso/boot/kernel.bin; \ - nasm ./src/bootloader/loader.asm -f bin -o ./iso/boot/boot.bin || exit; \ + nasm ./src/bootloader/stage1.asm -f bin -o ./build/stage1.bin || exit; \ + nasm ./src/bootloader/stage2.asm -f bin -o ./build/stage2.bin || exit; \ + cat ./build/stage1.bin ./build/stage2.bin > ./iso/boot/boot.bin; \ genisoimage -no-emul-boot -b boot/boot.bin -o ./build/melvix.iso ./iso; \ cross: |