Changeset 0b9ac3c in mainline for boot/Makefile.common

Timestamp:

2010-02-23T19:03:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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) (1 diff)

boot/Makefile.common

@@ -85 +85 @@
         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
 endif
+
+CFG =
+
+NET_SRVS = \
+        $(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 \
+        $(USPACEDIR)/srv/net/app/echo/echo
+
+NET_APPS = \
+        $(USPACEDIR)/srv/net/net/start/netstart \
+        $(USPACEDIR)/srv/net/app/ping/ping \
+        $(USPACEDIR)/srv/net/app/nettest1/nettest1 \
+        $(USPACEDIR)/srv/net/app/nettest2/nettest2
+
+ifneq ($(NETWORKING), none)
+NET_CFG = \
+        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \
+        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo \
+        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
+endif
+
+ifeq ($(NETWORKING), module)
+        RD_APPS +=      $(NET_APPS)
+
+        RD_SRVS +=      $(NET_SRVS)
+
+        CFG             +=      $(NET_CFG)
+else
+ifeq ($(NETWORKING), modular)
+        RD_APPS +=      $(NET_APPS)
+
+        RD_SRVS +=      $(NET_SRVS)
+
+        RD_SRVS +=      $(USPACEDIR)/srv/net/il/ip/ip \
+                        $(USPACEDIR)/srv/net/il/arp/arp \
+                        $(USPACEDIR)/srv/net/tl/udp/udp \
+                        $(USPACEDIR)/srv/net/tl/tcp/tcp \
+                        $(USPACEDIR)/srv/net/tl/icmp/icmp
+
+        CFG             +=      $(NET_CFG)
+endif
+endif
+