diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -102,16 +102,16 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img cp $(FILLUP) $@ dd if=$(MBR) of=$@ bs=512 seek=0 conv=notrunc dd if=$(STAGE2) of=$@ bs=512 seek=1 conv=notrunc - dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc + dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc #will end up at 0x18000 in ram dd if=FoolData.img of=$@ bs=512 seek=842 conv=notrunc binfont.img: binfont.bin cat $^ > $@ -FoolData.img: binfont.bin $(MP_BIN) userspace/userprog +FoolData.img: binfont.bin $(MP_BIN) userspace/ext2.img dd if=$(MP_BIN) of=$@ bs=512 seek=0 conv=notrunc dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc - dd if=userspace/userprog of=$@ bs=512 seek=4 conv=notrunc + dd if=userspace/ext2.img of=$@ bs=512 seek=4 conv=notrunc #will end up at 0x80800 in ram ############ vm stuff ############ @@ -131,10 +131,9 @@ clean: release: all -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2) -userspace/userprog: +userspace/ext2.img: make -C userspace - ############ test stuff ############ stick: FoolOS.img cat FoolOS.img > $(USB_STICK) && sync |