Changeset 7aaed09 in mainline for boot/Makefile.common

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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

@@ -53 +53 @@
 SANDBOX = pack
 PACK = $(TOOLS_PATH)/pack.py
-MKHORD = $(TOOLS_PATH)/mkhord.py
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
@@ -124 +123 @@
         test/test3 \
         nic/lo \
-        nic/ne2k
+        nic/ne2k \
+        nic/e1k
 
 RD_DRV_CFG =
@@ -175 +175 @@
         $(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 \
@@ -203 +204 @@
         $(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