From d680d4c641c085e7a31d19fe2d01f528e96d2ced Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Wed, 27 Aug 2014 16:32:34 +0200
Subject: put vesa init to top and integrated binary font.

binary fool-font is now part of the kernel image and
is loaded by the bootloader on startup into ram
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 659d86d..a512ddb 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,10 @@
 
 #lets use the size of a 1.44 floppy for a start for our boot img
 IMAGE_SIZE=1474560
+
+#font data starts at 0x8000
+FONT_DATA_START=25600
+
 #data starts at 0x8000
 DATA_START=32768
 
@@ -20,7 +24,7 @@ FoolOS.img: Fool.img FoolData.img fill.bin
 	cat $^ | head -c $(IMAGE_SIZE) > $@
 
 Fool.img: mbr.bin kernel.bin fill.bin
-	cat $^ | head -c $(DATA_START) > $@
+	cat $^ | head -c $(FONT_DATA_START) > $@
 
 FoolData.img:  binfont.bin
 	cat $^ > $@
-- 
cgit v1.2.3