Changes in boot/Makefile.common [619e6d56:3e67ab1] in mainline

File:

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

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT4 = $(TOOLS_PATH)/mkext4.py
+MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs \
-        $(USPACE_PATH)/srv/logger/logger
+        $(USPACE_PATH)/srv/vfs/vfs
 
 ifeq ($(RDFMT),tmpfs)
@@ -85 +84 @@
 endif
 
-ifeq ($(RDFMT),ext4fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
+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/input/input \
-        $(USPACE_PATH)/srv/hid/output/output \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/devman/devman \
-        $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor
+        $(USPACE_PATH)/srv/fs/locfs/locfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -101 +98 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
-        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -108 +104 @@
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
-        $(USPACE_PATH)/srv/fs/udf/udf \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(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 \
@@ -118 +111 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon
+        $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/devman/devman
 
 RD_DRVS = \
         infrastructure/root \
         infrastructure/rootvirt \
-        fb/kfb \
         test/test1 \
         test/test2 \
@@ -129 +122 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139 \
-        block/ahci
+        nic/rtl8139
 
 RD_DRV_CFG =
@@ -154 +146 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog \
-        $(USPACE_PATH)/app/vlaunch/vlaunch \
-        $(USPACE_PATH)/app/vterm/vterm
+        $(USPACE_PATH)/app/klog/klog
 
 RD_APPS_NON_ESSENTIAL = \
@@ -171 +161 @@
         $(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 \
@@ -181 +171 @@
         $(USPACE_PATH)/app/tester/tester \
         $(USPACE_PATH)/app/testread/testread \
-        $(USPACE_PATH)/app/testwrit/testwrit \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
@@ -196 +185 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/websrv/websrv \
-        $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo
+        $(USPACE_PATH)/app/websrv/websrv
 
 ifeq ($(CONFIG_PCC),y)
@@ -214 +201 @@
 endif
 
-ifeq ($(CONFIG_MSIM),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/msim/msim
-endif
-
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \