Changeset beb9336 in mainline for boot/Makefile.common

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

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

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT2 = $(TOOLS_PATH)/mkext2.py
+MKEXT4 = $(TOOLS_PATH)/mkext4.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs \
-        
-# TODO: For comfort ext4fs debugging - delete before merge
-INIT_TASKS += $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
+        $(USPACE_PATH)/srv/vfs/vfs
 
 ifeq ($(RDFMT),tmpfs)
@@ -87 +84 @@
 endif
 
-ifeq ($(RDFMT),ext2fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
+ifeq ($(RDFMT),ext4fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
 endif
 
 RD_SRVS_ESSENTIAL = \
-        $(USPACE_PATH)/srv/hid/fb/fb \
         $(USPACE_PATH)/srv/hid/input/input \
+        $(USPACE_PATH)/srv/hid/output/output \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/locfs/locfs
+        $(USPACE_PATH)/srv/devman/devman \
+        $(USPACE_PATH)/srv/fs/locfs/locfs \
+        $(USPACE_PATH)/srv/hid/compositor/compositor
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -111 +110 @@
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
+        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -116 +116 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/devman/devman
+        $(USPACE_PATH)/srv/taskmon/taskmon
 
 RD_DRVS = \
         infrastructure/root \
         infrastructure/rootvirt \
+        fb/kfb \
         test/test1 \
         test/test2 \
@@ -152 +152 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog
+        $(USPACE_PATH)/app/klog/klog \
+        $(USPACE_PATH)/app/vlaunch/vlaunch \
+        $(USPACE_PATH)/app/vterm/vterm
 
 RD_APPS_NON_ESSENTIAL = \
@@ -192 +194 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/websrv/websrv
+        $(USPACE_PATH)/app/websrv/websrv \
+        $(USPACE_PATH)/app/vdemo/vdemo
 
 ifeq ($(CONFIG_PCC),y)