Changes in boot/Makefile.common [80099c19:042fbe0] 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/mfs/mfs \
-        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
-        $(USPACE_PATH)/srv/fs/exfat/exfat \
-        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
+        $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
         $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
@@ -116 +109 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
+        
+RD_DRVS = \
+        root \
+        rootvirt \
+        test1 \
+        test2
 
-RD_DRVS = \
-        infrastructure/root \
-        infrastructure/rootvirt \
-        test/test1 \
-        test/test2 \
-        test/test3 \
-        nic/lo \
-        nic/ne2k
-
-RD_DRV_CFG =
+RD_DRV_CFG = 
 
 RD_LIBS =
-
-ifeq ($(CONFIG_DEVEL_FILES), y)
-        RD_LIBS += \
-                $(USPACE_PATH)/lib/c/libc.a \
-                $(USPACE_PATH)/lib/softint/libsoftint.a \
-                $(USPACE_PATH)/lib/softfloat/libsoftfloat.a
-endif
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
@@ -151 +134 @@
 
 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/mkmfs/mkmfs \
-        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
-        $(USPACE_PATH)/app/sportdmp/sportdmp \
         $(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 \
@@ -178 +152 @@
         $(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
-
-ifeq ($(CONFIG_PCC),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/cc/cc \
-        $(USPACE_PATH)/app/ccom/ccom \
-        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
-        $(USPACE_PATH)/app/cpp/cpp
-endif
-
-ifeq ($(CONFIG_BINUTILS),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/binutils/bin/as \
-        $(USPACE_PATH)/app/binutils/bin/ld
-endif
 
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo.nic \
-        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
+        $(USPACE_PATH)/srv/net/cfg/lo \
+        $(USPACE_PATH)/srv/net/cfg/ne2k
 endif