Changeset a33f0a6 in mainline for boot/Makefile.common

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• boot/Makefile.common (modified) (6 diffs)

boot/Makefile.common

@@ -56 +56 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
+MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -84 +85 @@
 endif
 
+ifeq ($(RDFMT),ext2fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
+endif
+
 RD_SRVS_ESSENTIAL = \
         $(USPACE_PATH)/srv/hid/fb/fb \
-        $(USPACE_PATH)/srv/hid/kbd/kbd \
+        $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
         $(USPACE_PATH)/srv/fs/devfs/devfs
@@ -98 +103 @@
         $(USPACE_PATH)/srv/fs/fat/fat \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
+        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
@@ -110 +116 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
-        
+
 RD_DRVS = \
-        root \
-        rootvirt \
-        test1 \
-        test2
-
-RD_DRV_CFG = 
+        infrastructure/root \
+        infrastructure/rootvirt \
+        test/test1 \
+        test/test2 \
+        test/test3
+
+RD_DRV_CFG =
+
+RD_LIBS =
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.so0 \
+                $(USPACE_PATH)/lib/softint/libsofti.so0
+        RD_APPS += \
+                $(USPACE_PATH)/app/dltest/dltest
+endif
 
 RD_APPS_ESSENTIAL = \
@@ -125 +142 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/blkdump/blkdump \
+        $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/dltest/dltest \
+        $(USPACE_PATH)/app/dltest2/dltest2 \
+        $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/filecrc/filecrc \
         $(USPACE_PATH)/app/filegen/filegen \
+        $(USPACE_PATH)/app/ext2info/ext2info \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \
         $(USPACE_PATH)/app/taskdump/taskdump \
         $(USPACE_PATH)/app/tester/tester \
+        $(USPACE_PATH)/app/testread/testread \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
@@ -142 +167 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/vuhid/vuh \
+        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv