Changeset fa9616b4 in mainline

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.

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (4 diffs)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• boot/arch/mips32/Makefile.inc (modified) (1 diff)
• boot/arch/ppc32/Makefile.inc (modified) (1 diff)
• boot/arch/sparc64/Makefile.inc (modified) (1 diff)

HelenOS.config

@@ -522 +522 @@
 ! CONFIG_NETIF_NIL_BUNDLE (n/y)
 
-% Bare-boned minimal size build
+% Strip binaries
+! CONFIG_STRIP_BINARIES (n/y)
+
+% Optimize for size
+! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
+
+% Bare boned build with essential binaries only 
 ! CONFIG_BARE_BONED (n/y)
 
-% Strip binaries
-! [CONFIG_BARE_BONED=y] CONFIG_STRIP_BINARIES (y)
-
-% Optimize for size
-! [CONFIG_BARE_BONED=y] CONFIG_OPTIMIZE_FOR_SIZE (y)
-

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))
 

boot/arch/amd64/Makefile.inc

@@ -29 +29 @@
 PAGE_SIZE = 4096
 
-RD_SRVS += \
+RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hw/char/i8042/i8042
+
+RD_SRVS_NON_ESSENTIAL += \
         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
-        $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
         $(USPACE_PATH)/srv/hw/bus/pci/pci \
         $(USPACE_PATH)/srv/hid/char_mouse/char_ms

boot/arch/arm32/Makefile.inc

@@ -35 +35 @@
 PAGE_SIZE = 4096
 
-RD_SRVS += \
+RD_SRVS_ESSENTIAL +=
+
+RD_SRVS_NON_ESSENTIAL += \
         $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
 

boot/arch/mips32/Makefile.inc

@@ -32 +32 @@
 EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
 
-RD_SRVS += \
+RD_SRVS_ESSENTIAL +=
+
+RD_SRVS_NON_ESSENTIAL += \
         $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
 

boot/arch/ppc32/Makefile.inc

@@ -40 +40 @@
 EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
 
-RD_SRVS += \
-        $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms \
+RD_SRVS_ESSENTIAL += \
         $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
+
+RD_SRVS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms
 
 SOURCES = \

boot/arch/sparc64/Makefile.inc

@@ -40 +40 @@
 EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu
 
-RD_SRVS += \
+RD_SRVS_NON_ESSENTIAL +=
+
+RD_SRVS_ESSENTIAL += \
         $(USPACE_PATH)/srv/hw/cir/fhc/fhc \
         $(USPACE_PATH)/srv/hw/cir/obio/obio