author: Masahiro Yamada <masahiroy@kernel.org> 2020-02-04 01:47:08 +0900
committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-02-03 17:31:43 +0000
commit: d4e9056daedca3891414fe3c91de3449a5dad0f2
parent: ad801428366ebbd541a5b8a1bf4d8b57ee7a8200
Commit Summary:
Diffstat:
2 files changed, 2 insertions, 1 deletion
diff --git a/usr/Kconfig b/usr/Kconfig
index 529caab1a328..bdf5bbd40727 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -102,6 +102,7 @@ config RD_LZ4
choice
prompt "Built-in initramfs compression mode"
+ depends on INITRAMFS_SOURCE != ""
help
This option allows you to decide by which algorithm the builtin
initramfs will be compressed. Several compression algorithms are
diff --git a/usr/Makefile b/usr/Makefile
index 244862bfb765..b6081bb2cc72 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -8,7 +8,7 @@
# with unpack_to_rootfs(). Make size_append no-op.
override size_append := :
-compress-$(CONFIG_INITRAMFS_COMPRESSION_NONE) := shipped
+compress-y := shipped
compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip
compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2
compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma