Changes in boot/Makefile.common [69a93df7:80099c19] in mainline

File:

• boot/Makefile.common (modified) (6 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
@@ -105 +106 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inet/inet \
-        $(USPACE_PATH)/srv/net/tcp/tcp \
-        $(USPACE_PATH)/srv/net/udp/udp \
         $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/net/nil/eth/eth \
+        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
+        $(USPACE_PATH)/srv/net/il/arp/arp \
+        $(USPACE_PATH)/srv/net/il/ip/ip \
+        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
+        $(USPACE_PATH)/srv/net/tl/udp/udp \
+        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
+        $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
 
@@ -120 +124 @@
         test/test3 \
         nic/lo \
-        nic/ne2k \
-        nic/e1k \
-        nic/rtl8139
+        nic/ne2k
 
 RD_DRV_CFG =
@@ -157 +159 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
-        $(USPACE_PATH)/app/inetcfg/inetcfg \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
@@ -174 +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 \
@@ -199 +199 @@
 endif
 
+ifneq ($(CONFIG_BAREBONE),y)
+NET_CFG = \
+        $(USPACE_PATH)/srv/net/cfg/general \
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
+endif
+
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \