Changeset fa9616b4 in mainline for boot/Makefile.common

Timestamp:

2010-05-12T22:52:55Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9929742

Parents:

be6cef1b

Message:

Split the binaries on RAM disk into two groups: essential and non-essential. The
essential group of binaries is needed for the system to boot into the shell.

Add CONFIG_BARE_BONED configure option to select that only essential binaries
should be included in the RAM disk image.

File:

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

boot/Makefile.common

@@ -82 +82 @@
 endif
 
-RD_SRVS = \
+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 = \
         $(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 \
@@ -105 +107 @@
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        RD_SRVS += \
+        RD_SRVS_NON_ESSENTIAL += \
                 $(USPACE_PATH)/srv/net/nil/eth/eth \
                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
 endif
 
-RD_APPS = \
+RD_APPS_ESSENTIAL = \
         $(USPACE_PATH)/app/bdsh/bdsh \
+        $(USPACE_PATH)/app/getterm/getterm \
+        $(USPACE_PATH)/app/klog/klog
+
+RD_APPS_NON_ESSENTIAL = \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \
@@ -130 +134 @@
         $(USPACE_PATH)/app/top/top
 
+ifneq ($(CONFIG_BARE_BONED),y)
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
         $(USPACE_PATH)/srv/net/cfg/lo \
         $(USPACE_PATH)/srv/net/cfg/ne2k
+endif
 
 COMPONENTS = \
@@ -146 +152 @@
 -include arch/$(BARCH)/Makefile.inc
 
+ifeq ($(CONFIG_BARE_BONED),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))