summary refs log tree commit diff
path: root/usr
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-01-05 00:02:32 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-01-14 10:42:44 +0900
commitf26661e1276537f5adda440a37e2a2c694147781 (patch)
treef4c236b490ebd38d73ca0e26886efa4f902bbd6b /usr
parentddd09bcc899fd374fe5567d9c35894a304f9e492 (diff)
downloadlinux-f26661e1276537f5adda440a37e2a2c694147781.tar.gz
initramfs: make initramfs compression choice non-optional
Currently, the choice of the initramfs compression mode is too complex
because users are allowed to not specify the compression mode at all.

I think it makes more sense to require users to choose the compression
mode explicitly, and delete the fallback defaults of INITRAMFS_COMPRESSION.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'usr')
-rw-r--r--usr/Kconfig8
1 files changed, 0 insertions, 8 deletions
diff --git a/usr/Kconfig b/usr/Kconfig
index 43934c128010..ab61e81165e0 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -102,7 +102,6 @@ config RD_LZ4
 
 choice
 	prompt "Built-in initramfs compression mode"
-	optional
 	help
 	  This option allows you to decide by which algorithm the builtin
 	  initramfs will be compressed.  Several compression algorithms are
@@ -218,10 +217,3 @@ config INITRAMFS_COMPRESSION
 	default ".xz"   if INITRAMFS_COMPRESSION_XZ
 	default ".lzo"  if INITRAMFS_COMPRESSION_LZO
 	default ".lz4"  if INITRAMFS_COMPRESSION_LZ4
-	default ".gz"   if RD_GZIP
-	default ".lz4"  if RD_LZ4
-	default ".lzo"  if RD_LZO
-	default ".xz"   if RD_XZ
-	default ".lzma" if RD_LZMA
-	default ".bz2"  if RD_BZIP2
-	default ""