summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentine Barshak <gvaxon@gmail.com>2012-10-09 23:34:56 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-07-08 12:50:31 (GMT)
commit391c82efa14d6db253f42616d970dacbe826b7d5 (patch)
treef3dd4b1df8935a6c4d1cca0311db61164138039d
parent5c7fb70a496fa86bdb7bd62f522d0d8dab4d6189 (diff)
downloadbuildroot-391c82efa14d6db253f42616d970dacbe826b7d5.tar.gz
buildroot-391c82efa14d6db253f42616d970dacbe826b7d5.tar.bz2
linux: Do not force GZIP initramfs compression
Initramfs compression does not make much sense for the architectures that support compressed kernel images because in this case the data would be compressed twice. This will eventually result in a bigger kernel image and time overhead when uncompressing it. The only reason to use compressed initramfs is to reduce memory usage when the kernel prepares rootfs, and both the unpacked filesystem and initramfs.cpio are present in the memory. Buildroot attempts to force GZIP compression for initramfs, however it doesn't always work because initramfs compression mode depends on RAM disk compression supported by the kernel. Thus, CONFIG_INITRAMFS_COMPRESSION_GZIP depends on CONFIG_RD_GZIP. If CONFIG_RD_GZIP is not set, setting GZIP initramfs compression will have no effect. Besides, the kernel also supports other compression methods, like BZIP2, LZMA, XZ and LZO. Forcing the good old GZIP does not really make much sense any more. This removes initramfs compression settings from Buildroot, so that the default value preset in the kernel config is used, which is CONFIG_INITRAMFS_COMPRESSION_NONE. If initramfs compression is still needed, it can be set in the kernel config (using make linux-menuconfig) Signed-off-by: Valentine Barshak <gvaxon@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--fs/initramfs/Config.in4
-rw-r--r--linux/linux.mk4
2 files changed, 3 insertions, 5 deletions
diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index 22066ee..ac45030 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -9,8 +9,8 @@ config BR2_TARGET_ROOTFS_INITRAMFS
A rootfs.cpio file will be generated in the images/ directory.
This is the archive that will be included in the kernel image.
- The rootfs in the kernel will always be gzip'ed, regardless
- of how buildroot's cpio archive is configured.
+ The default rootfs compression set in the kernel configuration
+ is used, regardless of how buildroot's cpio archive is configured.
Note that enabling initramfs together with another filesystem
formats doesn't make sense: you would end up having two
diff --git a/linux/linux.mk b/linux/linux.mk
index befef16..dfc948c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -182,9 +182,7 @@ define LINUX_CONFIGURE_CMDS
$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
- $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
- $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config))
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config))
$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))