Changeset 7715994 in mainline for boot/Makefile.common

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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

@@ -92 +92 @@
         $(USPACEDIR)/srv/net/net/net \
         $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \
         $(USPACEDIR)/srv/net/nil/eth/eth \
         $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
@@ -106 +105 @@
 NET_CFG = \
         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \
-        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo \
-        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
+        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo
+
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        NET_SRVS        +=      $(USPACEDIR)/srv/net/netif/dp8390/dp8390
+
+        NET_CFG +=      $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
 endif
 
@@ -131 +134 @@
 endif
 endif
-
+endif