Changeset 973ef9fc in mainline for boot/Makefile.common

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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

@@ -100 +100 @@
         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
         $(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 = \
@@ -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
 
 ifneq ($(CONFIG_BAREBONE),y)