summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
1 files changed, 2 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index c35be3b..22c6805 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
#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 starts at sector 50
FONT_DATA_START=25600
#data starts at 0x8000
@@ -92,24 +92,12 @@ printf.o: lib/printf/printf.c
kernel.bin: kernel_entry.o kernel.o console.o interrupts.o keyboard.o timer.o floppy.o x86.o shell.o mem.o vmem.o pci.o e1000.o vesa.o log.o printf.o
ld -o $@ -Ttext 0x1000 --oformat binary -melf_i386 $^ -O0
-#16bit bootloader!
-FoolBoot.img: mbr16.bin boot.bin fill.bin
- cat $^ | head -c $(IMAGE_SIZE) > $@
-boot.bin: boot16_entry.o boot16.o
- ld -o $@ -Ttext 0x1000 --oformat binary -melf_i386 $^ -O0
-mbr16.bin: boot/mbr16.asm
- nasm -f bin $^ -o $@
-boot16_entry.o: boot/boot16_entry.asm
- nasm -f elf $^ -o $@
-boot16.o: bootloader/boot16.c
- gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
-
-
# dump from vbox
dump: FoolOS.img
vboxmanage debugvm FoolOs dumpguestcore --filename dump.elf
xxd dump.elf > dump.xxd
+# run in our local bochs
run: FoolOS.img
~/temp/bochs-2.6.6/bochs -q