Changes in boot/Makefile.common [eb660787:d362410] in mainline

File:

• boot/Makefile.common (modified) (7 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
 
@@ -73 +72 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/loc/loc \
+        $(USPACE_PATH)/srv/devmap/devmap \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -85 +84 @@
 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/input/input \
+        $(USPACE_PATH)/srv/hid/kbd/kbd \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/locfs/locfs
+        $(USPACE_PATH)/srv/fs/devfs/devfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -102 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(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 \
@@ -116 +109 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
+        
+RD_DRVS = \
+        root \
+        rootvirt \
+        test1 \
+        test2 \
+        test3
 
-RD_DRVS = \
-        infrastructure/root \
-        infrastructure/rootvirt \
-        test/test1 \
-        test/test2 \
-        test/test3
-
-RD_DRV_CFG =
+RD_DRV_CFG = 
 
 RD_LIBS =
@@ -142 +135 @@
 
 RD_APPS_NON_ESSENTIAL = \
-        $(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 \
         $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/ext2info/ext2info \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
-        $(USPACE_PATH)/app/locinfo/locinfo \
         $(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 \
@@ -167 +153 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/top/top \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
-        $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/usbinfo/usbinfo \
-        $(USPACE_PATH)/app/vuhid/vuh \
-        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv