summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-10-24 13:59:06 +0200
committerMichal Idziorek <m.i@gmx.at>2014-10-24 13:59:06 +0200
commit55b3af4989e7908472d1dbfb3fe1bdd6e43262e1 (patch)
tree98bc925761d5b75380b0f5e0d87f286d964d720f /Makefile
parent831df8bcb2717442a41464533bacf0a58a4af0ce (diff)
moved kernel and ramimage to 0x100000 successfully
chs is broken however and only the first chunk seems to get loaded properly :(
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 31e0151..c130e17 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
USB_STICK=/dev/sdf #take care!
#here our kernel will be loaded by the bootloader.
-KERNEL_START=0x18000
+KERNEL_START=0x100000
#use our cross compiler
CC=i686-elf-gcc
@@ -102,8 +102,8 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img
cp $(FILLUP) $@
dd if=$(MBR) of=$@ bs=512 seek=0 conv=notrunc
dd if=$(STAGE2) of=$@ bs=512 seek=1 conv=notrunc
- dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc #will end up at 0x18000 in ram (this is what the booloader starts loading secotr: 10)
- dd if=FoolData.img of=$@ bs=512 seek=842 conv=notrunc
+ dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc #will end up at 0x100000 in ram (this is what the booloader starts loading secotr: 10)
+ dd if=FoolData.img of=$@ bs=512 seek=842 conv=notrunc #data starts at 0x168000
binfont.img: binfont.bin
cat $^ > $@