summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-09-05 09:34:53 +0200
committerMichal Idziorek <m.i@gmx.at>2014-09-05 09:34:53 +0200
commitc245268812a63bae0610de9a416dc7de97edde07 (patch)
tree1f3707e9d53fbf1d3265feb138d499a58b03cf69 /Makefile
parentb75c10c9d8c7405ba2f89724b485154d5201c404 (diff)
Moved kernel and reclaimed ACPI memory
finally our 2 stage bootloader also works with LBA loading via BIOS
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a039991..3e98bf8 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=0x10000
+KERNEL_START=0x18000
############ flags ############
@@ -96,7 +96,7 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img
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
- dd if=FoolData.img of=$@ bs=512 seek=906 conv=notrunc
+ dd if=FoolData.img of=$@ bs=512 seek=842 conv=notrunc
binfont.img: binfont.bin
cat $^ > $@