Changeset 0b749a3 in mainline for boot/Makefile.common

Timestamp:

2010-11-22T15:39:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

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

boot/Makefile.common

@@ -49 +49 @@
 DIST_PATH = $(USPACE_PATH)/dist
 TOOLS_PATH = $(ROOT_PATH)/tools
+DRVS_PATH = drv
 
 SANDBOX = pack
@@ -98 +99 @@
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
         $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/il/arp/arp \
@@ -105 +107 @@
         $(USPACE_PATH)/srv/net/tl/tcp/tcp \
         $(USPACE_PATH)/srv/net/net/net \
-        $(USPACE_PATH)/srv/net/netstart/netstart \
+        $(USPACE_PATH)/srv/devman/devman
+        
+RD_DRVS = \
+        root \
+        vhc
+
+RD_DRV_CFG = 
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
@@ -125 +133 @@
         $(USPACE_PATH)/app/taskdump/taskdump \
         $(USPACE_PATH)/app/tester/tester \
+        $(USPACE_PATH)/app/test_serial/test_serial \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
+        $(USPACE_PATH)/app/netstart/netstart \
         $(USPACE_PATH)/app/nettest1/nettest1 \
         $(USPACE_PATH)/app/nettest2/nettest2 \
@@ -132 +142 @@
         $(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