Changeset 00aece0 in mainline for boot/Makefile.common

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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
@@ -102 +101 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/mfs/mfs \
+        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
+        $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
+        $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
-        $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
         $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
@@ -121 +122 @@
         test/test1 \
         test/test2 \
-        test/test3
+        test/test3 \
+        nic/lo \
+        nic/ne2k \
+        nic/e1k \
+        nic/rtl8139
 
 RD_DRV_CFG =
 
 RD_LIBS =
+
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.a \
+                $(USPACE_PATH)/lib/softint/libsoftint.a \
+                $(USPACE_PATH)/lib/softfloat/libsoftfloat.a
+endif
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
@@ -153 +165 @@
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
+        $(USPACE_PATH)/app/sportdmp/sportdmp \
         $(USPACE_PATH)/app/redir/redir \
         $(USPACE_PATH)/app/taskdump/taskdump \
@@ -163 +177 @@
         $(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 \
@@ -173 +188 @@
         $(USPACE_PATH)/app/websrv/websrv
 
+ifeq ($(CONFIG_PCC),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/cc/cc \
+        $(USPACE_PATH)/app/ccom/ccom \
+        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
+        $(USPACE_PATH)/app/cpp/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/binutils/bin/as \
+        $(USPACE_PATH)/app/binutils/bin/ld
+endif
+
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo \
-        $(USPACE_PATH)/srv/net/cfg/ne2k
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
+        $(USPACE_PATH)/srv/net/cfg/e1k.nic
 endif