Commit d4bbe942 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: remove CONFIG_MODULE_COMPRESS 



CONFIG_MODULE_COMPRESS is only used to activate the choice for module
compression algorithm. It will be simpler to make the choice always
visible, and add CONFIG_MODULE_COMPRESS_NONE in the choice.

This is more consistent with the "Kernel compression mode" and "Built-in
initramfs compression mode" choices. CONFIG_KERNEL_UNCOMPRESSED and
CONFIG_INITRAMFS_COMPRESSION_NONE are available to choose no compression.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent 961ab4a3

init/Kconfig

+26 −19
Original line number Original line Diff line number Diff line
@@ -2225,40 +2225,47 @@ config MODULE_SIG_HASH 
	default "sha384" if MODULE_SIG_SHA384

	default "sha384" if MODULE_SIG_SHA384

	default "sha512" if MODULE_SIG_SHA512

	default "sha512" if MODULE_SIG_SHA512





config MODULE_COMPRESS

choice

	bool "Compress modules on installation"

	prompt "Module compression mode"

	help

	help

	  This option allows you to choose the algorithm which will be used to

	  compress modules when 'make modules_install' is run. (or, you can

	  choose to not compress modules at all.)





	  Compresses kernel modules when 'make modules_install' is run; gzip or

	  External modules will also be compressed in the same way during the

	  xz depending on "Compression algorithm" below.

	  installation.





	  module-init-tools MAY support gzip, and kmod MAY support gzip and xz.

	  For modules inside an initrd or initramfs, it's more efficient to

	  compress the whole initrd or initramfs instead.





	  Out-of-tree kernel modules installed using Kbuild will also be

	  This is fully compatible with signed modules.

	  compressed upon installation.





	  Note: for modules inside an initrd or initramfs, it's more efficient

	  Please note that the tool used to load modules needs to support the

	  to compress the whole initrd or initramfs instead.

	  corresponding algorithm. module-init-tools MAY support gzip, and kmod

	  MAY support gzip and xz.





	  Note: This is fully compatible with signed modules.

	  Your build system needs to provide the appropriate compression tool

	  to compress the modules.





	  If in doubt, say N.

	  If in doubt, select 'None'.





choice

config MODULE_COMPRESS_NONE

	prompt "Compression algorithm"

	bool "None"

	depends on MODULE_COMPRESS

	default MODULE_COMPRESS_GZIP

	help

	help

	  This determines which sort of compression will be used during

	  Do not compress modules. The installed modules are suffixed

	  'make modules_install'.

	  with .ko.



	  GZIP (default) and XZ are supported.





config MODULE_COMPRESS_GZIP

config MODULE_COMPRESS_GZIP

	bool "GZIP"

	bool "GZIP"

	help

	  Compress modules with GZIP. The installed modules are suffixed

	  with .ko.gz.





config MODULE_COMPRESS_XZ

config MODULE_COMPRESS_XZ

	bool "XZ"

	bool "XZ"

	help

	  Compress modules with XZ. The installed modules are suffixed

	  with .ko.xz.





endchoice

endchoice