diff options
| author | Michal Idziorek <miguel@miguel-acer.softwarefools.com> | 2014-08-28 22:51:35 +0200 |
|---|---|---|
| committer | Michal Idziorek <miguel@miguel-acer.softwarefools.com> | 2014-08-28 22:51:35 +0200 |
| commit | 5cfa0e21a9bb0c19b0bd3ee916df74d90db81115 (patch) | |
| tree | 3d3b8c2849b02d9b9945b73d4119e856c14bf78b | |
| parent | 70d0b36830616a9f94ee0afa8486dc510e9743eb (diff) | |
Minor cleanup of the Makefile
| -rw-r--r-- | Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -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 |
