Changeset b7068da in mainline for boot/Makefile.common

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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) (4 diffs)

boot/Makefile.common

@@ -105 +105 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
+        $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
@@ -123 +124 @@
         test/test3 \
         nic/lo \
-        nic/ne2k
+        nic/ne2k \
+        nic/e1k \
+        nic/rtl8139
 
 RD_DRV_CFG =
@@ -174 +177 @@
         $(USPACE_PATH)/app/nettest1/nettest1 \
         $(USPACE_PATH)/app/nettest2/nettest2 \
+        $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
         $(USPACE_PATH)/app/ping/ping \
@@ -202 +206 @@
         $(USPACE_PATH)/srv/net/cfg/general \
         $(USPACE_PATH)/srv/net/cfg/lo.nic \
-        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
+        $(USPACE_PATH)/srv/net/cfg/e1k.nic
 endif