From a30a9b21c3e0af7996a551381a8f41075bada7ad Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 9 Nov 2019 19:13:55 +0100
Subject: Started own implementation of asm bootloader

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 426d650..6317d6b 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
-- 
cgit v1.2.3