From 347ee926fd09d7fb45025f2c4e4a4eeab83459c9 Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Mon, 1 Sep 2014 13:26:52 +0200
Subject: Added kernel_entry for APs

---
 Makefile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 08d784f..8222e07 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,8 @@
 #lets use the size of a 1.44 floppy for a start for our boot img
 IMAGE_SIZE=1474560
 
+#ap bin :
+MP_IMG_START=25088
 
 #font data starts at sector 50
 FONT_DATA_START=25600
@@ -47,6 +49,12 @@ KERNEL_ENTRY=./boot/kernel_entry.o
 
 MBR=./boot/mbr.bin
 
+
+#multiprocessor binary entry
+
+MP_BIN=./boot/mp.bin
+
+
 #some fillup data (zeros)
 
 FILLUP=./data/fill.bin
@@ -83,13 +91,16 @@ binfont.bin: data/binfont.src
 
 # master boot record, kernel binary and fool-font 
 
-FoolOS.img: Fool.img FoolData.img $(FILLUP)
+FoolOS.img: mbr_kernel_mp.img binfont.img $(FILLUP)
 	cat $^ | head -c $(IMAGE_SIZE) > $@
 
-Fool.img: $(MBR) kernel.bin $(FILLUP)
+mbr_kernel_mp.img: mbr_kernel.img $(MP_BIN) $(FILLUP)
 	cat $^ | head -c $(FONT_DATA_START) > $@
 
-FoolData.img:  binfont.bin
+mbr_kernel.img: $(MBR) kernel.bin $(FILLUP)
+	cat $^ | head -c $(MP_IMG_START) > $@
+
+binfont.img:  binfont.bin
 	cat $^ > $@
 
 
@@ -104,7 +115,7 @@ run: FoolOS.img
 ############ cleanup ############
 
 clean:
-	-rm *.bin *.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) bochs.out ne2k-tx.log ne2k-txdump.txt
+	-rm *.bin *.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt
 
 ############ test stuff ############
 acer:  FoolOS.img
-- 
cgit v1.2.3