Initrd support was removed, and CONFIG_RD_LZMA has nothing to do with ramdisks.
Update your configs Signed-off-by: Askar Safin <safinas...@gmail.com> --- arch/arm/configs/clps711x_defconfig | 2 +- arch/arm/configs/hisi_defconfig | 2 +- arch/arm/configs/lpc18xx_defconfig | 2 +- arch/arm/configs/sp7021_defconfig | 2 +- arch/arm/configs/vf610m4_defconfig | 2 +- arch/mips/configs/bmips_stb_defconfig | 2 +- arch/openrisc/configs/simple_smp_defconfig | 2 +- arch/powerpc/configs/44x/fsp2_defconfig | 2 +- arch/powerpc/configs/skiroot_defconfig | 2 +- arch/riscv/configs/nommu_k210_defconfig | 2 +- arch/riscv/configs/nommu_virt_defconfig | 2 +- arch/sh/configs/sdk7786_defconfig | 2 +- arch/xtensa/configs/cadence_csp_defconfig | 2 +- arch/xtensa/configs/nommu_kc705_defconfig | 2 +- usr/Kconfig | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig index 4d71d227361f..18ae5ee9d6c9 100644 --- a/arch/arm/configs/clps711x_defconfig +++ b/arch/arm/configs/clps711x_defconfig @@ -2,7 +2,7 @@ CONFIG_KERNEL_LZMA=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y -CONFIG_RD_LZMA=y +CONFIG_INITRAMFS_DECOMPRESS_LZMA=y CONFIG_EXPERT=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index fe18af17b7cc..19816374a0d0 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig @@ -2,7 +2,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_INITRAMFS=y -CONFIG_RD_LZMA=y +CONFIG_INITRAMFS_DECOMPRESS_LZMA=y CONFIG_ARCH_HISI=y CONFIG_ARCH_HI3xxx=y CONFIG_ARCH_HIP01=y diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig index abde171f1742..b1d5d8e4d7fe 100644 --- a/arch/arm/configs/lpc18xx_defconfig +++ b/arch/arm/configs/lpc18xx_defconfig @@ -2,7 +2,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/arm/configs/sp7021_defconfig b/arch/arm/configs/sp7021_defconfig index 4f5cd0d0511d..cfb20e693e1e 100644 --- a/arch/arm/configs/sp7021_defconfig +++ b/arch/arm/configs/sp7021_defconfig @@ -7,7 +7,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig index 9e6175467998..9b20db4bb8e6 100644 --- a/arch/arm/configs/vf610m4_defconfig +++ b/arch/arm/configs/vf610m4_defconfig @@ -1,7 +1,7 @@ CONFIG_NAMESPACES=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index 6ccb53279345..300e67507a1f 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -16,7 +16,7 @@ CONFIG_NR_CPUS=4 CONFIG_MIPS_O32_FP64_SUPPORT=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set CONFIG_RD_XZ=y # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig index ba6f06c29fed..5e46664549ec 100644 --- a/arch/openrisc/configs/simple_smp_defconfig +++ b/arch/openrisc/configs/simple_smp_defconfig @@ -4,7 +4,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig index 696f63bbc56e..038a261ebc20 100644 --- a/arch/powerpc/configs/44x/fsp2_defconfig +++ b/arch/powerpc/configs/44x/fsp2_defconfig @@ -9,7 +9,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_INITRAMFS=y -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig index a5b30aba9ac1..008a63a90330 100644 --- a/arch/powerpc/configs/skiroot_defconfig +++ b/arch/powerpc/configs/skiroot_defconfig @@ -12,7 +12,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig index bc0df803ecaa..282b889596a1 100644 --- a/arch/riscv/configs/nommu_k210_defconfig +++ b/arch/riscv/configs/nommu_k210_defconfig @@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=13 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index 1291e21b7ce5..e9231eadcbad 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -2,7 +2,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index 2c339b2111fe..f19e9915e6de 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -28,7 +28,7 @@ CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_INITRAMFS=y CONFIG_INITRAMFS_DECOMPRESS_BZIP2=y -CONFIG_RD_LZMA=y +CONFIG_INITRAMFS_DECOMPRESS_LZMA=y CONFIG_RD_LZO=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y diff --git a/arch/xtensa/configs/cadence_csp_defconfig b/arch/xtensa/configs/cadence_csp_defconfig index 06d82e725e64..6b38ba64a2aa 100644 --- a/arch/xtensa/configs/cadence_csp_defconfig +++ b/arch/xtensa/configs/cadence_csp_defconfig @@ -15,7 +15,7 @@ CONFIG_RELAY=y CONFIG_INITRAMFS=y CONFIG_INITRAMFS_SOURCE="$$KERNEL_INITRAMFS_SOURCE" # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/xtensa/configs/nommu_kc705_defconfig b/arch/xtensa/configs/nommu_kc705_defconfig index cde2ae3ca4b1..9b260f57e63f 100644 --- a/arch/xtensa/configs/nommu_kc705_defconfig +++ b/arch/xtensa/configs/nommu_kc705_defconfig @@ -16,7 +16,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_LZMA is not set +# CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/usr/Kconfig b/usr/Kconfig index 325c2d95eb74..030c6a898d7a 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -68,7 +68,7 @@ config INITRAMFS_DECOMPRESS_BZIP2 Support loading of a bzip2 encoded initial ramfs. If unsure, say N. -config RD_LZMA +config INITRAMFS_DECOMPRESS_LZMA bool "Support initial ramfs compressed using LZMA" default y select DECOMPRESS_LZMA @@ -157,7 +157,7 @@ config INITRAMFS_COMPRESSION_BZIP2 config INITRAMFS_COMPRESSION_LZMA bool "LZMA" - depends on RD_LZMA + depends on INITRAMFS_DECOMPRESS_LZMA help This algorithm's compression ratio is best but has a large dictionary size which might cause issues in memory constrained systems. -- 2.47.2