From 75c46037e742f07001fafc5a093b27556d2490c9 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Thu, 4 Sep 2014 15:51:43 +0200 Subject: reenabled symmetric multiprocessing entry --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d59d676..426ae78 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ############ phony targets ############ -.PHONY: all clean run +.PHONY: all clean run stick new newrun ############ some constants ############ @@ -58,6 +58,10 @@ FILLUP=./data/fill.bin all: FoolOS.img FoolData.img +new: clean all + +newrun: clean run + ############ nasm assembling rules ############ %.o: %.asm @@ -92,8 +96,10 @@ FoolOS.img: $(MBR) kernel.bin $(FILLUP) binfont.img: binfont.bin cat $^ > $@ -FoolData.img: binfont.bin - cp $^ $@ +FoolData.img: $(FILLUP) binfont.bin $(MP_BIN) + cp $(FILLUP) $@ + dd if=$(MP_BIN) of=$@ bs=512 seek=0 conv=notrunc + dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc ############ vm stuff ############ -- cgit v1.2.3