Initrd support was removed, and CONFIG_RD_BZIP2 has nothing to do with ramdisks. Update your configs Signed-off-by: Askar Safin <safinaskar@xxxxxxxxx> --- arch/arm/configs/aspeed_g4_defconfig | 2 +- arch/arm/configs/aspeed_g5_defconfig | 2 +- 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/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/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index f2abada5036a..af891a2b2d6c 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig @@ -9,7 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y CONFIG_NAMESPACES=y CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 7098a09fefb8..a16aed0abcaa 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig @@ -9,7 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y CONFIG_NAMESPACES=y CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig index c8f7fa140225..abde171f1742 100644 --- a/arch/arm/configs/lpc18xx_defconfig +++ b/arch/arm/configs/lpc18xx_defconfig @@ -1,7 +1,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/arm/configs/sp7021_defconfig b/arch/arm/configs/sp7021_defconfig index 30cfafc49ec9..4f5cd0d0511d 100644 --- a/arch/arm/configs/sp7021_defconfig +++ b/arch/arm/configs/sp7021_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig index b253d76e0d40..9e6175467998 100644 --- a/arch/arm/configs/vf610m4_defconfig +++ b/arch/arm/configs/vf610m4_defconfig @@ -1,6 +1,6 @@ CONFIG_NAMESPACES=y CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig index 58ae5f9726a0..7c1ec18b0eeb 100644 --- a/arch/mips/configs/ath25_defconfig +++ b/arch/mips/configs/ath25_defconfig @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 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/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index 2217a3ca5b72..6ccb53279345 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -15,7 +15,7 @@ CONFIG_NR_CPUS=4 # CONFIG_SECCOMP is not set CONFIG_MIPS_O32_FP64_SUPPORT=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set CONFIG_RD_XZ=y # CONFIG_RD_LZO is not set diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig index e4aaaeaec7a8..ba6f06c29fed 100644 --- a/arch/openrisc/configs/simple_smp_defconfig +++ b/arch/openrisc/configs/simple_smp_defconfig @@ -3,7 +3,7 @@ CONFIG_NO_HZ=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig index 9a6ef1d8ca44..a5b30aba9ac1 100644 --- a/arch/powerpc/configs/skiroot_defconfig +++ b/arch/powerpc/configs/skiroot_defconfig @@ -11,7 +11,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=20 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig index a1fa77563bb8..bc0df803ecaa 100644 --- a/arch/riscv/configs/nommu_k210_defconfig +++ b/arch/riscv/configs/nommu_k210_defconfig @@ -2,7 +2,7 @@ CONFIG_LOG_BUF_SHIFT=13 CONFIG_INITRAMFS=y # CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index d777e4a774bd..1291e21b7ce5 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -1,7 +1,7 @@ # CONFIG_CPU_ISOLATION is not set CONFIG_LOG_BUF_SHIFT=16 CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index dd0ef63a0064..2c339b2111fe 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -27,7 +27,7 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_INITRAMFS=y -CONFIG_RD_BZIP2=y +CONFIG_INITRAMFS_DECOMPRESS_BZIP2=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/xtensa/configs/cadence_csp_defconfig b/arch/xtensa/configs/cadence_csp_defconfig index 788274247b03..06d82e725e64 100644 --- a/arch/xtensa/configs/cadence_csp_defconfig +++ b/arch/xtensa/configs/cadence_csp_defconfig @@ -14,7 +14,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_INITRAMFS=y CONFIG_INITRAMFS_SOURCE="$$KERNEL_INITRAMFS_SOURCE" -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/xtensa/configs/nommu_kc705_defconfig b/arch/xtensa/configs/nommu_kc705_defconfig index 5050b3e5e1be..cde2ae3ca4b1 100644 --- a/arch/xtensa/configs/nommu_kc705_defconfig +++ b/arch/xtensa/configs/nommu_kc705_defconfig @@ -15,7 +15,7 @@ CONFIG_NAMESPACES=y CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_INITRAMFS=y -# CONFIG_RD_BZIP2 is not set +# CONFIG_INITRAMFS_DECOMPRESS_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/usr/Kconfig b/usr/Kconfig index cf3c7539e3dc..325c2d95eb74 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -60,7 +60,7 @@ config INITRAMFS_DECOMPRESS_GZIP Support loading of a gzip encoded initial ramfs. If unsure, say Y. -config RD_BZIP2 +config INITRAMFS_DECOMPRESS_BZIP2 bool "Support initial ramfs compressed using bzip2" default y select DECOMPRESS_BZIP2 @@ -144,7 +144,7 @@ config INITRAMFS_COMPRESSION_GZIP config INITRAMFS_COMPRESSION_BZIP2 bool "Bzip2" - depends on RD_BZIP2 + depends on INITRAMFS_DECOMPRESS_BZIP2 help It's compression ratio and speed is intermediate. Decompression speed is slowest among the choices. The initramfs size is about 10% smaller -- 2.47.2
