Changes in boot/Makefile.common [15b592b:4872160] in mainline

File:

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

boot/Makefile.common

@@ -82 +82 @@
 endif
 
-RD_SRVS_ESSENTIAL = \
-        $(USPACE_PATH)/srv/hid/fb/fb \
-        $(USPACE_PATH)/srv/hid/kbd/kbd \
-        $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/devfs/devfs
-
-RD_SRVS_NON_ESSENTIAL = \
+RD_SRVS = \
         $(USPACE_PATH)/srv/bd/file_bd/file_bd \
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
         $(USPACE_PATH)/srv/clip/clip \
+        $(USPACE_PATH)/srv/hid/fb/fb \
+        $(USPACE_PATH)/srv/hid/kbd/kbd \
+        $(USPACE_PATH)/srv/hid/console/console \
+        $(USPACE_PATH)/srv/fs/devfs/devfs \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
@@ -107 +105 @@
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        RD_SRVS_NON_ESSENTIAL += \
+        RD_SRVS += \
                 $(USPACE_PATH)/srv/net/nil/eth/eth \
                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
 endif
 
-RD_APPS_ESSENTIAL = \
+RD_APPS = \
         $(USPACE_PATH)/app/bdsh/bdsh \
+        $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog
-
-RD_APPS_NON_ESSENTIAL = \
-        $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/klog/klog \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \
@@ -133 +129 @@
         $(USPACE_PATH)/app/tasks/tasks \
         $(USPACE_PATH)/app/top/top
+#       $(USPACE_PATH)/app/dummy_load/dummy_load
 
-ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
         $(USPACE_PATH)/srv/net/cfg/lo \
         $(USPACE_PATH)/srv/net/cfg/ne2k
-endif
 
 COMPONENTS = \
@@ -152 +147 @@
 -include arch/$(BARCH)/Makefile.inc
 
-ifeq ($(CONFIG_BAREBONE),y)
-RD_SRVS = $(RD_SRVS_ESSENTIAL)
-RD_APPS = $(RD_APPS_ESSENTIAL)
-else
-RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
-RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
-endif
-
 MODULES := $(notdir $(COMPONENTS))