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

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

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

usr/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -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

usr/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ klibcdirs:; 
PHONY += klibcdirs





# No compression

suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE)   =



# Gzip, but no bzip2

suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP)   = .gz