aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr/Kconfig15
-rw-r--r--usr/Makefile3
2 files changed, 1 insertions, 17 deletions
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
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 If unsure, say N. 73 If unsure, say N.
74 74
75if INITRAMFS_SOURCE!=""
76
77choice 75choice
78 prompt "Built-in initramfs compression mode" 76 prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
79 help 77 help
80 This option decides by which algorithm the builtin initramfs 78 This option decides by which algorithm the builtin initramfs
81 will be compressed. Several compression algorithms are 79 will be compressed. Several compression algorithms are
@@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA
134 smaller with LZMA in comparison to gzip. 132 smaller with LZMA in comparison to gzip.
135 133
136endchoice 134endchoice
137
138endif
139
140if INITRAMFS_SOURCE=""
141# The builtin initramfs is so small so we don't want to bug the user...
142
143config INITRAMFS_COMPRESSION_NONE
144 bool
145 default y
146
147endif
diff --git a/usr/Makefile b/usr/Makefile
index b84894b3929d..245145a99c10 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -6,9 +6,6 @@ klibcdirs:;
6PHONY += klibcdirs 6PHONY += klibcdirs
7 7
8 8
9# No compression
10suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) =
11
12# Gzip, but no bzip2 9# Gzip, but no bzip2
13suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz 10suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz
14 11