From 0842318f890f0bdc259fa6f2bc05ab74e2bbb7f1 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 28 Mar 2009 17:24:03 -0700 Subject: [PATCH] --- yaml --- r: 137611 b: refs/heads/master c: 40297927575a50b1d0d308d735c445924d33fba6 h: refs/heads/master i: 137609: 8b3b0d241e97094f7ecc376689b4ba10999a5f35 137607: 8044540bdf99d7c200703121623e18327a0a8578 v: v3 --- [refs] | 2 +- trunk/usr/Kconfig | 32 ++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e36b11eb0869..f79964bd1eca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55d1d26f23383163a256d0de2aaf2b8fca83e611 +refs/heads/master: 40297927575a50b1d0d308d735c445924d33fba6 diff --git a/trunk/usr/Kconfig b/trunk/usr/Kconfig index a529b4d0530b..588c588791e2 100644 --- a/trunk/usr/Kconfig +++ b/trunk/usr/Kconfig @@ -72,23 +72,24 @@ 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" help - This setting is only meaningful if the INITRAMFS_SOURCE is - set. It decides by which algorithm the INITRAMFS_SOURCE will - be compressed. - Several compression algorithms are available, which differ - in efficiency, compression and decompression speed. - Compression speed is only relevant when building a kernel. - Decompression speed is relevant at each boot. + This option decides by which algorithm the builtin initramfs + will be compressed. Several compression algorithms are + available, which differ in efficiency, compression and + decompression speed. Compression speed is only relevant + when building a kernel. Decompression speed is relevant at + each boot. If you have any problems with bzip2 or LZMA compressed initramfs, mail me (Alain Knaff) . - High compression options are mostly useful for users who - are low on disk space (embedded systems), but for whom ram - size matters less. + High compression options are mostly useful for users who are + low on RAM, since it reduces the memory consumption during + boot. If in doubt, select 'gzip' @@ -133,3 +134,14 @@ 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