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

Commit 2e9f3bdd authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

bzip2/lzma: make config machinery an arch configurable 



Impact: Bug fix (we should not show this menu on irrelevant architectures)

Make the config machinery to drive the gzip/bzip2/lzma selection
dependent on the architecture advertising HAVE_KERNEL_* so that we
don't display this for architectures where it doesn't matter.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 0f5e2d24

arch/x86/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,9 @@ config X86 
	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select USER_STACKTRACE_SUPPORT

	select USER_STACKTRACE_SUPPORT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA





config ARCH_DEFCONFIG

config ARCH_DEFCONFIG

	string

	string

init/Kconfig

+31 −21
Original line number Original line Diff line number Diff line
@@ -101,9 +101,19 @@ config LOCALVERSION_AUTO 




	  which is done within the script "scripts/setlocalversion".)

	  which is done within the script "scripts/setlocalversion".)





config HAVE_KERNEL_GZIP

	bool



config HAVE_KERNEL_BZIP2

	bool



config HAVE_KERNEL_LZMA

	bool



choice

choice

	prompt "Kernel compression mode"

	prompt "Kernel compression mode"

	default KERNEL_GZIP

	default KERNEL_GZIP

	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA

	help

	help

	  The linux kernel is a kind of self-extracting executable.

	  The linux kernel is a kind of self-extracting executable.

	  Several compression algorithms are available, which differ

	  Several compression algorithms are available, which differ
@@ -124,6 +134,7 @@ choice 




config KERNEL_GZIP

config KERNEL_GZIP

	bool "Gzip"

	bool "Gzip"

	depends on HAVE_KERNEL_GZIP

	help

	help

	  The old and tried gzip compression. Its compression ratio is

	  The old and tried gzip compression. Its compression ratio is

	  the poorest among the 3 choices; however its speed (both

	  the poorest among the 3 choices; however its speed (both
@@ -131,26 +142,25 @@ config KERNEL_GZIP 




config KERNEL_BZIP2

config KERNEL_BZIP2

	bool "Bzip2"

	bool "Bzip2"

	depends on HAVE_KERNEL_BZIP2

	help

	help

	  Its compression ratio and speed is intermediate.

	  Its compression ratio and speed is intermediate.

	  Decompression speed is slowest among the 3.

	  Decompression speed is slowest among the three.  The kernel

	  The kernel size is about 10 per cent smaller with bzip2,

	  size is about 10% smaller with bzip2, in comparison to gzip.

	  in comparison to gzip.

	  Bzip2 uses a large amount of memory. For modern kernels you

	  Bzip2 uses a large amount of memory. For modern kernels

	  will need at least 8MB RAM or more for booting.

	  you will need at least 8MB RAM or more for booting.





config KERNEL_LZMA

config KERNEL_LZMA

	bool "LZMA"

	bool "LZMA"

	depends on HAVE_KERNEL_LZMA

	help

	help

	  The most recent compression algorithm.

	  The most recent compression algorithm.

	  Its ratio is best, decompression speed is between the other

	  Its ratio is best, decompression speed is between the other

	 2. Compression is slowest.

	  two. Compression is slowest.	The kernel size is about 33%

	 The kernel size is about 33 per cent smaller with lzma,

	  smaller with LZMA in comparison to gzip.

	 in comparison to gzip.





endchoice

endchoice







config SWAP

config SWAP

	bool "Support for paging of anonymous memory (swap)"

	bool "Support for paging of anonymous memory (swap)"

	depends on MMU && BLOCK

	depends on MMU && BLOCK