Changeset 14f1db0 in mainline for boot/Makefile.common

Timestamp:

2010-04-09T12:54:57Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a1caa3c2

Parents:

24ab58b3

Message:

networking overhaul:

• separation of conserns
• removal of (almost all) overlaping symbols, libnetif is not needed anymore
• again, it is possible to build the networking in multiple architecture configurations (however, currently only the bundling netif and nil layers is supported, more to come)
• code style updates and fixes (still a huge amount of work to do)

File:

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

boot/Makefile.common

@@ -40 +40 @@
         $(USPACEDIR)/srv/bd/rd/rd \
         $(USPACEDIR)/srv/vfs/vfs
+
 ifeq ($(RDFMT),tmpfs)
         INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
 endif
+
 ifeq ($(RDFMT),fat)
         INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
@@ -60 +62 @@
         $(USPACEDIR)/srv/taskmon/taskmon \
         $(USPACEDIR)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACEDIR)/srv/net/netif/lo/lo \
+        $(USPACEDIR)/srv/net/il/arp/arp \
+        $(USPACEDIR)/srv/net/il/ip/ip \
+        $(USPACEDIR)/srv/net/tl/icmp/icmp \
+        $(USPACEDIR)/srv/net/tl/udp/udp \
+        $(USPACEDIR)/srv/net/tl/tcp/tcp \
         $(USPACEDIR)/srv/net/net/net \
         $(USPACEDIR)/srv/net/netstart/netstart \
-        $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/nil/eth/eth \
-        $(USPACEDIR)/srv/net/nil/nildummy/nildummy
+
+ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/net/nil/eth/eth \
+                $(USPACEDIR)/srv/net/nil/nildummy/nildummy
+endif
 
 RD_APPS = \
@@ -78 +89 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/trace/trace \
+        $(USPACEDIR)/app/nettest1/nettest1 \
+        $(USPACEDIR)/app/nettest2/nettest2 \
         $(USPACEDIR)/app/netecho/netecho \
-        $(USPACEDIR)/app/ping/ping \
-        $(USPACEDIR)/app/nettest1/nettest1 \
-        $(USPACEDIR)/app/nettest2/nettest2
+        $(USPACEDIR)/app/ping/ping
 
 COMPONENTS = \
@@ -91 +102 @@
         $(USPACEDIR)/srv/bd/rd/rd \
         $(USPACEDIR)/srv/vfs/vfs
+
 ifeq ($(RDFMT),tmpfs)
         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
 endif
+
 ifeq ($(RDFMT),fat)
         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
@@ -99 +112 @@
 
 NET_CFG = \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/general \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/lo \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/ne2k
-
-ifeq ($(CONFIG_NETWORKING),modular)
-        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
-endif
+        $(USPACEDIR)/srv/net/cfg/general \
+        $(USPACEDIR)/srv/net/cfg/lo \
+        $(USPACEDIR)/srv/net/cfg/ne2k