Changeset 7964475 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2010-12-10T15:08:26Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c01255c
Parents:
b5ec347 (diff), cdc1aa1 (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 with development/

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rb5ec347 r7964475  
    111111RD_DRVS = \
    112112        root \
     113        rootvirt \
     114        test1 \
     115        test2 \
    113116        vhc
    114117
    … …  
    142145        $(USPACE_PATH)/app/ping/ping \
    143146        $(USPACE_PATH)/app/stats/stats \
    144         $(USPACE_PATH)/app/virtusbkbd/vuk \
    145147        $(USPACE_PATH)/app/tasks/tasks \
    146         $(USPACE_PATH)/app/top/top
     148        $(USPACE_PATH)/app/top/top \
     149        $(USPACE_PATH)/app/usbinfo/usbinfo \
     150        $(USPACE_PATH)/app/virtusbkbd/vuk
    147151
    148152ifneq ($(CONFIG_BAREBONE),y)
Note: See TracChangeset for help on using the changeset viewer.