Changeset 925a21e in mainline for boot/Makefile.common

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (7 diffs)

boot/Makefile.common

@@ -73 +73 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/devmap/devmap \
+        $(USPACE_PATH)/srv/loc/loc \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -93 +93 @@
         $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/devfs/devfs
+        $(USPACE_PATH)/srv/fs/locfs/locfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -102 +102 @@
         $(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/taskmon/taskmon \
@@ -127 +130 @@
 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)
         RD_LIBS += \
@@ -143 +153 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/devctl/devctl \
         $(USPACE_PATH)/app/dltest/dltest \
         $(USPACE_PATH)/app/dltest2/dltest2 \
@@ -150 +161 @@
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
+        $(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 \
@@ -171 +185 @@
         $(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 = \