Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b

Authored by Linus Torvalds
2 parents 503e576303 4029792757
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… 

…/git/x86/linux-2.6-tip

* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
  bzip2/lzma: don't ask for compression mode for the default initramfs
  bzip2/lzma: consistently capitalize LZMA in Kconfig
  bzip2/lzma: clarify the meaning of the CONFIG_RD_ options
  bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED

Showing 1 changed file Side-by-side Diff

... ... @@ -46,49 +46,50 @@
46 46 If you are not sure, leave it set to "0".
47 47  
48 48 config RD_GZIP
49   - bool "Initial ramdisk compressed using gzip"
  49 + bool "Support initial ramdisks compressed using gzip" if EMBEDDED
50 50 default y
51   - depends on BLK_DEV_INITRD=y
  51 + depends on BLK_DEV_INITRD
52 52 select DECOMPRESS_GZIP
53 53 help
54 54 Support loading of a gzip encoded initial ramdisk or cpio buffer.
55 55 If unsure, say Y.
56 56  
57 57 config RD_BZIP2
58   - bool "Initial ramdisk compressed using bzip2"
59   - default n
60   - depends on BLK_DEV_INITRD=y
  58 + bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
  59 + default !EMBEDDED
  60 + depends on BLK_DEV_INITRD
61 61 select DECOMPRESS_BZIP2
62 62 help
63 63 Support loading of a bzip2 encoded initial ramdisk or cpio buffer
64 64 If unsure, say N.
65 65  
66 66 config RD_LZMA
67   - bool "Initial ramdisk compressed using lzma"
68   - default n
69   - depends on BLK_DEV_INITRD=y
  67 + bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
  68 + default !EMBEDDED
  69 + depends on BLK_DEV_INITRD
70 70 select DECOMPRESS_LZMA
71 71 help
72   - Support loading of a lzma encoded initial ramdisk or cpio buffer
  72 + Support loading of a LZMA encoded initial ramdisk or cpio buffer
73 73 If unsure, say N.
74 74  
  75 +if INITRAMFS_SOURCE!=""
  76 +
75 77 choice
76 78 prompt "Built-in initramfs compression mode"
77 79 help
78   - This setting is only meaningful if the INITRAMFS_SOURCE is
79   - set. It decides by which algorithm the INITRAMFS_SOURCE will
80   - be compressed.
81   - Several compression algorithms are available, which differ
82   - in efficiency, compression and decompression speed.
83   - Compression speed is only relevant when building a kernel.
84   - Decompression speed is relevant at each boot.
  80 + This option decides by which algorithm the builtin initramfs
  81 + will be compressed. Several compression algorithms are
  82 + available, which differ in efficiency, compression and
  83 + decompression speed. Compression speed is only relevant
  84 + when building a kernel. Decompression speed is relevant at
  85 + each boot.
85 86  
86   - If you have any problems with bzip2 or lzma compressed
  87 + If you have any problems with bzip2 or LZMA compressed
87 88 initramfs, mail me (Alain Knaff) <alain@knaff.lu>.
88 89  
89   - High compression options are mostly useful for users who
90   - are low on disk space (embedded systems), but for whom ram
91   - size matters less.
  90 + High compression options are mostly useful for users who are
  91 + low on RAM, since it reduces the memory consumption during
  92 + boot.
92 93  
93 94 If in doubt, select 'gzip'
94 95  
... ... @@ -133,4 +134,15 @@
133 134 smaller with LZMA in comparison to gzip.
134 135  
135 136 endchoice
  137 +
  138 +endif
  139 +
  140 +if INITRAMFS_SOURCE=""
  141 +# The builtin initramfs is so small so we don't want to bug the user...
  142 +
  143 +config INITRAMFS_COMPRESSION_NONE
  144 + bool
  145 + default y
  146 +
  147 +endif