Changeset 7a68fe5 in mainline for boot

Timestamp:

2011-10-10T06:58:55Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 mainline

File:

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

boot/Makefile.common

@@ -111 +111 @@
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(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 \
@@ -128 +126 @@
         test/test1 \
         test/test2 \
-        test/test3
+        test/test3 \
+        nic/lo \
+        nic/ne2k
 
 RD_DRV_CFG =
@@ -206 +206 @@
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo \
-        $(USPACE_PATH)/srv/net/cfg/ne2k
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
 endif