Changeset c01255c in mainline for boot/Makefile.common

Timestamp:

2010-12-10T15:12:25Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10096231

Parents:

98d06b8 (diff), 7964475 (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 remote smekideki repository

File:

• boot/Makefile.common (modified) (2 diffs)

boot/Makefile.common

@@ -111 +111 @@
 RD_DRVS = \
         root \
+        rootvirt \
+        test1 \
+        test2 \
         vhc
 
@@ -142 +145 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
-        $(USPACE_PATH)/app/virtusbkbd/vuk \
         $(USPACE_PATH)/app/tasks/tasks \
-        $(USPACE_PATH)/app/top/top
+        $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/virtusbkbd/vuk
 
 ifneq ($(CONFIG_BAREBONE),y)