Changeset 49ff5f3 in mainline for boot/Makefile.common

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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) (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
@@ -106 +105 @@
         $(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
 
@@ -124 +120 @@
         test/test3 \
         nic/lo \
-        nic/ne2k
+        nic/ne2k \
+        nic/e1k \
+        nic/rtl8139
 
 RD_DRV_CFG =
@@ -159 +157 @@
         $(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 \
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
@@ -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 \
@@ -199 +200 @@
 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 \