Changeset 357b5f5 in mainline for boot/Makefile.common

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (5 diffs)

boot/Makefile.common

@@ -98 +98 @@
         $(USPACE_PATH)/srv/fs/fat/fat \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
         $(USPACE_PATH)/srv/net/netif/lo/lo \
+        $(USPACE_PATH)/srv/net/nil/eth/eth \
+        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
         $(USPACE_PATH)/srv/net/il/arp/arp \
         $(USPACE_PATH)/srv/net/il/ip/ip \
@@ -109 +111 @@
         
 RD_DRVS = \
-        root
+        root \
+        rootvirt \
+        test1 \
+        test2
 
 RD_DRV_CFG = 
-
-ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        RD_SRVS_NON_ESSENTIAL += \
-                $(USPACE_PATH)/srv/net/nil/eth/eth \
-                $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
-endif
 
 RD_APPS_ESSENTIAL = \
@@ -126 +125 @@
 RD_APPS_NON_ESSENTIAL = \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/kill/kill \
+        $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \
@@ -131 +132 @@
         $(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 \
@@ -141 +140 @@
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/tasks/tasks \
-        $(USPACE_PATH)/app/top/top
+        $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/websrv/websrv
 
 ifneq ($(CONFIG_BAREBONE),y)