diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-04 15:51:43 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-04 15:51:43 +0200 |
| commit | 75c46037e742f07001fafc5a093b27556d2490c9 (patch) | |
| tree | 463089fd3c37f6ac397958d113c73b9b1ebfd426 /Makefile | |
| parent | 06e382afcbf199e5e4ec92574a3872ab04fb6e9e (diff) | |
reenabled symmetric multiprocessing entry
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -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 ############ |