Changeset affaf2e in mainline for boot


Ignore:
Timestamp:
2012-08-15T15:13:20Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b546231
Parents:
f66ca57f (diff), 135486d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    rf66ca57f raffaf2e  
    4747        $(MKFAT) 1048576 $(DIST_PATH) $@
    4848endif
    49 ifeq ($(RDFMT),ext2fs)
    50         $(MKEXT2) 1048576 $(DIST_PATH) $@
     49ifeq ($(RDFMT),ext4fs)
     50        $(MKEXT4) 1048576 $(DIST_PATH) $@
    5151endif
    5252

  • boot/Makefile.common

    rf66ca57f raffaf2e  
    5555MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
    5656MKFAT = $(TOOLS_PATH)/mkfat.py
    57 MKEXT2 = $(TOOLS_PATH)/mkext2.py
     57MKEXT4 = $(TOOLS_PATH)/mkext4.py
    5858MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
    5959
    … …  
    8484endif
    8585
    86 ifeq ($(RDFMT),ext2fs)
    87         INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
     86ifeq ($(RDFMT),ext4fs)
     87        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
    8888endif
    8989
    … …  
    106106        $(USPACE_PATH)/srv/fs/exfat/exfat \
    107107        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
     108        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
    108109        $(USPACE_PATH)/srv/hid/remcons/remcons \
    109110        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
    … …  
    174175        $(USPACE_PATH)/app/tester/tester \
    175176        $(USPACE_PATH)/app/testread/testread \
     177        $(USPACE_PATH)/app/testwrit/testwrit \
    176178        $(USPACE_PATH)/app/tetris/tetris \
    177179        $(USPACE_PATH)/app/trace/trace \
Note: See TracChangeset for help on using the changeset viewer.