Changeset 8fb1bf82 in mainline for boot/Makefile.common

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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.

File:

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

boot/Makefile.common

@@ -49 +49 @@
 DIST_PATH = $(USPACE_PATH)/dist
 TOOLS_PATH = $(ROOT_PATH)/tools
+DRVS_PATH = drv
 
 SANDBOX = pack
@@ -105 +106 @@
         $(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
+
+RD_DRV_CFG = 
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
@@ -125 +131 @@
         $(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 \