Initrd support was removed, and CONFIG_RD_XZ has nothing to do with ramdisks. Update your configs Signed-off-by: Askar Safin --- arch/arm/configs/lpc18xx_defconfig | 2 +- arch/arm/configs/sp7021_defconfig | 2 +- arch/arm/configs/vf610m4_defconfig | 2 +- arch/mips/configs/ath25_defconfig | 2 +- arch/mips/configs/bmips_stb_defconfig | 2 +- arch/openrisc/configs/simple_smp_defconfig | 2 +- arch/powerpc/configs/44x/fsp2_defconfig | 2 +- arch/riscv/configs/nommu_k210_defconfig | 2 +- arch/riscv/configs/nommu_virt_defconfig | 2 +- arch/xtensa/configs/cadence_csp_defconfig | 2 +- arch/xtensa/configs/nommu_kc705_defconfig | 2 +- usr/Kconfig | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig index b1d5d8e4d7fe..816586530ff5 100644 --- a/arch/arm/configs/lpc18xx_defconfig +++ b/arch/arm/configs/lpc18xx_defconfig @@ -3,7 +3,7 @@ CONFIG_PREEMPT=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ 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/arm/configs/sp7021_defconfig b/arch/arm/configs/sp7021_defconfig index cfb20e693e1e..2d9bbda67e85 100644 --- a/arch/arm/configs/sp7021_defconfig +++ b/arch/arm/configs/sp7021_defconfig @@ -8,7 +8,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ 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/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig index 9b20db4bb8e6..7d457a196dfc 100644 --- a/arch/arm/configs/vf610m4_defconfig +++ b/arch/arm/configs/vf610m4_defconfig @@ -2,7 +2,7 @@ CONFIG_NAMESPACES=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig index 7c1ec18b0eeb..e401b29ce706 100644 --- a/arch/mips/configs/ath25_defconfig +++ b/arch/mips/configs/ath25_defconfig @@ -5,7 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ 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/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index 300e67507a1f..072bfdc87771 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -17,7 +17,7 @@ CONFIG_MIPS_O32_FP64_SUPPORT=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -CONFIG_RD_XZ=y +CONFIG_INITRAMFS_DECOMPRESS_XZ=y # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_PCI=y diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig index 5e46664549ec..7080bdedea01 100644 --- a/arch/openrisc/configs/simple_smp_defconfig +++ b/arch/openrisc/configs/simple_smp_defconfig @@ -5,7 +5,7 @@ CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig index 038a261ebc20..ffb345222649 100644 --- a/arch/powerpc/configs/44x/fsp2_defconfig +++ b/arch/powerpc/configs/44x/fsp2_defconfig @@ -10,7 +10,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_KALLSYMS_ALL=y diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig index 282b889596a1..10ffb9ea40bd 100644 --- a/arch/riscv/configs/nommu_k210_defconfig +++ b/arch/riscv/configs/nommu_k210_defconfig @@ -4,7 +4,7 @@ CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set # CONFIG_RD_ZSTD is not set diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index e9231eadcbad..9383e3445ead 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ 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/xtensa/configs/cadence_csp_defconfig b/arch/xtensa/configs/cadence_csp_defconfig index 6b38ba64a2aa..f102ed913e9b 100644 --- a/arch/xtensa/configs/cadence_csp_defconfig +++ b/arch/xtensa/configs/cadence_csp_defconfig @@ -16,7 +16,7 @@ CONFIG_INITRAMFS=y CONFIG_INITRAMFS_SOURCE="$$KERNEL_INITRAMFS_SOURCE" # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ 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/xtensa/configs/nommu_kc705_defconfig b/arch/xtensa/configs/nommu_kc705_defconfig index 9b260f57e63f..d3916408eaf6 100644 --- a/arch/xtensa/configs/nommu_kc705_defconfig +++ b/arch/xtensa/configs/nommu_kc705_defconfig @@ -17,7 +17,7 @@ CONFIG_RELAY=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_INITRAMFS_DECOMPRESS_LZMA is not set -# CONFIG_RD_XZ is not set +# CONFIG_INITRAMFS_DECOMPRESS_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y diff --git a/usr/Kconfig b/usr/Kconfig index 030c6a898d7a..69f95a5a1847 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -76,7 +76,7 @@ config INITRAMFS_DECOMPRESS_LZMA Support loading of a LZMA encoded initial ramfs. If unsure, say N. -config RD_XZ +config INITRAMFS_DECOMPRESS_XZ bool "Support initial ramfs compressed using XZ" default y select DECOMPRESS_XZ @@ -170,7 +170,7 @@ config INITRAMFS_COMPRESSION_LZMA config INITRAMFS_COMPRESSION_XZ bool "XZ" - depends on RD_XZ + depends on INITRAMFS_DECOMPRESS_XZ help XZ uses the LZMA2 algorithm and has a large dictionary which may cause problems on memory constrained systems. The initramfs size is about -- 2.47.2