From: H. Peter Anvin Date: Tue, 31 Mar 2009 19:24:17 +0000 (-0700) Subject: bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1359096eacb1971be67eead8bf9b582864d92a30;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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: H. Peter Anvin --- diff --git a/usr/Kconfig b/usr/Kconfig index 588c588791e2..1c3039f28909 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -72,10 +72,8 @@ config RD_LZMA Support loading of a LZMA encoded initial ramdisk or cpio buffer If unsure, say N. -if INITRAMFS_SOURCE!="" - choice - prompt "Built-in initramfs compression mode" + prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!="" help This option decides by which algorithm the builtin initramfs will be compressed. Several compression algorithms are @@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA smaller with LZMA in comparison to gzip. 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 diff --git a/usr/Makefile b/usr/Makefile index b84894b3929d..245145a99c10 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -6,9 +6,6 @@ klibcdirs:; PHONY += klibcdirs -# No compression -suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) = - # Gzip, but no bzip2 suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz