diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 $^ > $@ |