Changeset 246 for trunk/Makefile


Ignore:
Timestamp:
Jul 20, 2017, 12:55:23 PM (5 years ago)
Author:
alain
Message:

Fix a major bug in FATFS : miss handling in the FAT mapper.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r238 r246  
    222222MTOOLS_SKIP_CHECK := 1
    223223
    224 # Rule to compile boot.elf, kernel.elf, and update virtual disk.
    225 compile: dirs                               \
    226                  hard_config.h              \
    227                  build/boot/boot.elf        \
    228          build/kernel/kernel.elf    \
     224# Rule to generate compile boot.elf, kernel.elf, init.elf and update virtual disk.
     225compile: dirs                     \
     226         hard_config.h            \
     227                 build/boot/boot.elf      \
     228         build/kernel/kernel.elf  \
     229         build/user/init/init.elf \
    229230         list
    230231
     
    241242        @mkdir -p build/kernel/vfs
    242243        @mkdir -p build/kernel/syscalls
     244        @mkdir -p build/user
     245        @mkdir -p build/user/init
     246        @mkdir -p build/user/ksh
    243247        @mkdir -p hdd
    244248
     
    246250list:
    247251        mdir -/ -w -i $(DISK_IMAGE) ::/
    248 
    249 # Rule to make a file system check for the virtual disk.
    250 fsck:
    251         fsck.msdos $(DISK_IMAGE)
    252252
    253253##############################################################
     
    263263        rm -f hard_config.h arch_info.xml arch_info.bin
    264264        rm -rf build
     265        cd user/init   &&  $(MAKE) clean  &&  cd ../..
    265266
    266267####################################################   
    267268# Rule for building a new virtual disk from scratch.
    268 # It creates the bin / home directories.
     269# It creates the bin, bin/kernel, bin/init, and home directories.
    269270# This requires the generic Linux/MacOS 'create_dmg' script, that should be
    270271# placed in the same directory as this Makefile.
     
    276277        mmd                     -o -i $(DISK_IMAGE) ::/bin         || true
    277278        mmd                     -o -i $(DISK_IMAGE) ::/bin/kernel  || true
     279        mmd                     -o -i $(DISK_IMAGE) ::/bin/init    || true
    278280        mmd                     -o -i $(DISK_IMAGE) ::/home        || true
    279281        mdir             -/ -b -i $(DISK_IMAGE) ::/
     
    488490        mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel
    489491
     492############################################################
     493# Rule to generate the init.elf and place it on virtual disk
     494build/user/init/init.elf : user/init/init.c
     495        $(MAKE) -C user/init
     496        mcopy -o -i $(DISK_IMAGE) user/init/init.elf ::/bin/init
     497 
     498
Note: See TracChangeset for help on using the changeset viewer.