Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 389f0411 authored by Eugeniy Paltsev's avatar Eugeniy Paltsev Committed by Greg Kroah-Hartman
Browse files

initramfs: restore default compression behavior 



[ Upstream commit 785d74ec3bbf26ac7f6e92e6e96a259aec0f107a ]

Even though INITRAMFS_SOURCE kconfig option isn't set in most of
defconfigs it is used (set) extensively by various build systems.
Commit f26661e12765 ("initramfs: make initramfs compression choice
non-optional") has changed default compression mode. Previously we
compress initramfs using available compression algorithm. Now
we don't use any compression at all by default.
It significantly increases the image size in case of build system
chooses embedded initramfs. Initially I faced with this issue while
using buildroot.

As of today it's not possible to set preferred compression mode
in target defconfig as this option depends on INITRAMFS_SOURCE
being set. Modification of all build systems either doesn't look
like good option.

Let's instead rewrite initramfs compression mode choices list
the way that "INITRAMFS_COMPRESSION_NONE" will be the last option
in the list. In that case it will be chosen only if all other
options (which implements any compression) are not available.

Signed-off-by: default avatarEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f8c1e65e

usr/Kconfig

+11 −11
Original line number Diff line number Diff line
@@ -131,17 +131,6 @@ choice 


	  If in doubt, select 'None'



config INITRAMFS_COMPRESSION_NONE

	bool "None"

	help

	  Do not compress the built-in initramfs at all. This may sound wasteful

	  in space, but, you should be aware that the built-in initramfs will be

	  compressed at a later stage anyways along with the rest of the kernel,

	  on those architectures that support this. However, not compressing the

	  initramfs may lead to slightly higher memory consumption during a

	  short time at boot, while both the cpio image and the unpacked

	  filesystem image will be present in memory simultaneously



config INITRAMFS_COMPRESSION_GZIP

	bool "Gzip"

	depends on RD_GZIP
@@ -214,6 +203,17 @@ config INITRAMFS_COMPRESSION_LZ4 
	  If you choose this, keep in mind that most distros don't provide lz4

	  by default which could cause a build failure.



config INITRAMFS_COMPRESSION_NONE

	bool "None"

	help

	  Do not compress the built-in initramfs at all. This may sound wasteful

	  in space, but, you should be aware that the built-in initramfs will be

	  compressed at a later stage anyways along with the rest of the kernel,

	  on those architectures that support this. However, not compressing the

	  initramfs may lead to slightly higher memory consumption during a

	  short time at boot, while both the cpio image and the unpacked

	  filesystem image will be present in memory simultaneously



endchoice



config INITRAMFS_COMPRESSION