Changeset b800b0e in mainline for boot/Makefile.common

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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) (4 diffs)

boot/Makefile.common

@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs
+        $(USPACE_PATH)/srv/vfs/vfs \
+        $(USPACE_PATH)/srv/logger/logger
 
 ifeq ($(RDFMT),tmpfs)
@@ -158 +159 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/bithenge/bithenge \
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
@@ -170 +172 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
+        $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
-        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -196 +198 @@
         $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv \
+        $(USPACE_PATH)/app/date/date \
         $(USPACE_PATH)/app/vdemo/vdemo