diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -15,10 +15,6 @@ USB_STICK=/dev/sdg #take care! -MP_IMG_START=26112 #code for the other processors intialllly at 0x6600 - -FONT_DATA_START=26624 #fool font initially at 0x6800 - #here our kernel will be loaded by the bootloader. KERNEL_START=0x10000 @@ -48,7 +44,6 @@ KERNEL_ENTRY=./boot/kernel_entry.o MBR=./boot/mbr.bin - #multiprocessor binary entry MP_BIN=./boot/mp.bin @@ -63,7 +58,6 @@ FILLUP=./data/fill.bin all: FoolOS.img FoolData.img - ############ nasm assembling rules ############ %.o: %.asm @@ -90,17 +84,15 @@ binfont.bin: data/binfont.src # master boot record, kernel binary and fool-font -FoolOS.img: $(MBR) kernel.bin $(MP_BIN) binfont.img $(FILLUP) +FoolOS.img: $(MBR) kernel.bin $(FILLUP) cp $(FILLUP) $@ dd if=$(MBR) of=$@ bs=1 seek=0 conv=notrunc dd if=kernel.bin of=$@ bs=1 seek=512 conv=notrunc - dd if=$(MP_BIN) of=$@ bs=1 seek=$(MP_IMG_START) conv=notrunc - dd if=binfont.img of=$@ bs=1 seek=$(FONT_DATA_START) conv=notrunc binfont.img: binfont.bin cat $^ > $@ -FoolData.img: data/testdata +FoolData.img: binfont.bin cp $^ $@ ############ vm stuff ############ |