Commit 1359096e authored by H. Peter Anvin's avatar H. Peter Anvin

bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE

Impact: quiet Kconfig warning

It appears that Kconfig simply has no way to provide defaults for
entries that exist inside a conditionalized choice block.
Fortunately, it turns out we don't actually ever use
CONFIG_INITRAMFS_COMPRESSION_NONE, so we can just drop it for
everything outside the choice block.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 15f7176e
...@@ -72,10 +72,8 @@ config RD_LZMA ...@@ -72,10 +72,8 @@ config RD_LZMA
Support loading of a LZMA encoded initial ramdisk or cpio buffer Support loading of a LZMA encoded initial ramdisk or cpio buffer
If unsure, say N. If unsure, say N.
if INITRAMFS_SOURCE!=""
choice choice
prompt "Built-in initramfs compression mode" prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
help help
This option decides by which algorithm the builtin initramfs This option decides by which algorithm the builtin initramfs
will be compressed. Several compression algorithms are will be compressed. Several compression algorithms are
...@@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA ...@@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA
smaller with LZMA in comparison to gzip. smaller with LZMA in comparison to gzip.
endchoice endchoice
endif
if INITRAMFS_SOURCE=""
# The builtin initramfs is so small so we don't want to bug the user...
config INITRAMFS_COMPRESSION_NONE
bool
default y
endif
...@@ -6,9 +6,6 @@ klibcdirs:; ...@@ -6,9 +6,6 @@ klibcdirs:;
PHONY += klibcdirs PHONY += klibcdirs
# No compression
suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) =
# Gzip, but no bzip2 # Gzip, but no bzip2
suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment