Initrd support was removed, and CONFIG_RD_GZIP has nothing to do with ramdisks. Update your configs Signed-off-by: Askar Safin --- arch/arc/configs/tb10x_defconfig | 2 +- arch/arm/configs/sp7021_defconfig | 2 +- arch/mips/configs/ath25_defconfig | 2 +- arch/mips/configs/ath79_defconfig | 2 +- arch/mips/configs/bmips_stb_defconfig | 2 +- arch/mips/configs/rt305x_defconfig | 2 +- arch/mips/configs/xway_defconfig | 2 +- arch/openrisc/configs/or1ksim_defconfig | 2 +- arch/openrisc/configs/simple_smp_defconfig | 2 +- arch/powerpc/configs/mgcoge_defconfig | 2 +- arch/powerpc/configs/skiroot_defconfig | 2 +- arch/riscv/configs/nommu_k210_defconfig | 2 +- usr/Kconfig | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig index 26a06eb336df..f177600a527a 100644 --- a/arch/arc/configs/tb10x_defconfig +++ b/arch/arc/configs/tb10x_defconfig @@ -13,7 +13,7 @@ CONFIG_INITRAMFS=y CONFIG_INITRAMFS_SOURCE="../tb10x-rootfs.cpio" CONFIG_INITRAMFS_ROOT_UID=2100 CONFIG_INITRAMFS_ROOT_GID=501 -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set CONFIG_KALLSYMS_ALL=y # CONFIG_AIO is not set CONFIG_EXPERT=y diff --git a/arch/arm/configs/sp7021_defconfig b/arch/arm/configs/sp7021_defconfig index ec723401b440..30cfafc49ec9 100644 --- a/arch/arm/configs/sp7021_defconfig +++ b/arch/arm/configs/sp7021_defconfig @@ -5,7 +5,7 @@ CONFIG_PREEMPT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig index cb16a1f18db8..58ae5f9726a0 100644 --- a/arch/mips/configs/ath25_defconfig +++ b/arch/mips/configs/ath25_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig index 014bb1107b86..500b94dfc6c1 100644 --- a/arch/mips/configs/ath79_defconfig +++ b/arch/mips/configs/ath79_defconfig @@ -2,7 +2,7 @@ CONFIG_SYSVIPC=y CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_AIO is not set # CONFIG_KALLSYMS is not set CONFIG_EXPERT=y diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index ed4d4be772be..2217a3ca5b72 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -14,7 +14,7 @@ CONFIG_SMP=y CONFIG_NR_CPUS=4 # CONFIG_SECCOMP is not set CONFIG_MIPS_O32_FP64_SUPPORT=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set CONFIG_RD_XZ=y diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig index bf4dd5930876..9102f9ebcf88 100644 --- a/arch/mips/configs/rt305x_defconfig +++ b/arch/mips/configs/rt305x_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_AIO is not set CONFIG_KALLSYMS_ALL=y diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig index 41d0d7d8cb6c..fa49183a4147 100644 --- a/arch/mips/configs/xway_defconfig +++ b/arch/mips/configs/xway_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_AIO is not set CONFIG_KALLSYMS_ALL=y diff --git a/arch/openrisc/configs/or1ksim_defconfig b/arch/openrisc/configs/or1ksim_defconfig index 96578bfb7159..56ddb48f7955 100644 --- a/arch/openrisc/configs/or1ksim_defconfig +++ b/arch/openrisc/configs/or1ksim_defconfig @@ -1,7 +1,7 @@ CONFIG_NO_HZ=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_EPOLL is not set diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig index f7c807b32d50..e4aaaeaec7a8 100644 --- a/arch/openrisc/configs/simple_smp_defconfig +++ b/arch/openrisc/configs/simple_smp_defconfig @@ -2,7 +2,7 @@ CONFIG_LOCALVERSION="-simple-smp" CONFIG_NO_HZ=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig index 1b782855c84a..6d543b9f0bc6 100644 --- a/arch/powerpc/configs/mgcoge_defconfig +++ b/arch/powerpc/configs/mgcoge_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set CONFIG_KALLSYMS_ALL=y # CONFIG_PCSPKR_PLATFORM is not set CONFIG_EXPERT=y diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig index 1611e15a72f3..9a6ef1d8ca44 100644 --- a/arch/powerpc/configs/skiroot_defconfig +++ b/arch/powerpc/configs/skiroot_defconfig @@ -10,7 +10,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=20 CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_LZO is not set diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig index 7824f13e84f3..a1fa77563bb8 100644 --- a/arch/riscv/configs/nommu_k210_defconfig +++ b/arch/riscv/configs/nommu_k210_defconfig @@ -1,7 +1,7 @@ # CONFIG_CPU_ISOLATION is not set CONFIG_LOG_BUF_SHIFT=13 CONFIG_INITRAMFS=y -# CONFIG_RD_GZIP is not set +# CONFIG_INITRAMFS_DECOMPRESS_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set diff --git a/usr/Kconfig b/usr/Kconfig index 8899353bd7d5..cf3c7539e3dc 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -52,7 +52,7 @@ config INITRAMFS_ROOT_GID If you are not sure, leave it set to "0". -config RD_GZIP +config INITRAMFS_DECOMPRESS_GZIP bool "Support initial ramfs compressed using gzip" default y select DECOMPRESS_GZIP @@ -134,7 +134,7 @@ choice config INITRAMFS_COMPRESSION_GZIP bool "Gzip" - depends on RD_GZIP + depends on INITRAMFS_DECOMPRESS_GZIP help Use the old and well tested gzip compression algorithm. Gzip provides a good balance between compression ratio and decompression speed and -- 2.47.2