diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-08-27 16:32:34 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-08-27 16:32:34 +0200 |
| commit | d680d4c641c085e7a31d19fe2d01f528e96d2ced (patch) | |
| tree | fb1f35486c584feaeb087c740c42508f7abe32fc /Makefile | |
| parent | d85b6209f37b4d886f9e85fd9592c9d7cf25deb9 (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 $^ > $@ |