| Message ID | 20200104150238.19834-6-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | initramfs: a lot of cleanups | expand |
Masahiro Yamada <masahiroy@kernel.org> wrote: > init/Kconfig includes usr/Kconfig inside the "if BLK_DEV_INITRD" ... > "endif" block: > > if BLK_DEV_INITRD > > source "usr/Kconfig" > > endif > > Hence, all the defines in usr/Kconfig depend on BLK_DEV_INITRD. > > Remove the redundant "depends on BLK_DEV_INITRD". > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Greg Thelen <gthelen@google.com> > --- > > Changes in v2: None > > usr/Kconfig | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/usr/Kconfig b/usr/Kconfig > index a6b68503d177..72f50a21c051 100644 > --- a/usr/Kconfig > +++ b/usr/Kconfig > @@ -54,7 +54,6 @@ config INITRAMFS_ROOT_GID > > config RD_GZIP > bool "Support initial ramdisk/ramfs compressed using gzip" > - depends on BLK_DEV_INITRD > default y > select DECOMPRESS_GZIP > help > @@ -64,7 +63,6 @@ config RD_GZIP > config RD_BZIP2 > bool "Support initial ramdisk/ramfs compressed using bzip2" > default y > - depends on BLK_DEV_INITRD > select DECOMPRESS_BZIP2 > help > Support loading of a bzip2 encoded initial ramdisk or cpio buffer > @@ -73,7 +71,6 @@ config RD_BZIP2 > config RD_LZMA > bool "Support initial ramdisk/ramfs compressed using LZMA" > default y > - depends on BLK_DEV_INITRD > select DECOMPRESS_LZMA > help > Support loading of a LZMA encoded initial ramdisk or cpio buffer > @@ -81,7 +78,6 @@ config RD_LZMA > > config RD_XZ > bool "Support initial ramdisk/ramfs compressed using XZ" > - depends on BLK_DEV_INITRD > default y > select DECOMPRESS_XZ > help > @@ -91,7 +87,6 @@ config RD_XZ > config RD_LZO > bool "Support initial ramdisk/ramfs compressed using LZO" > default y > - depends on BLK_DEV_INITRD > select DECOMPRESS_LZO > help > Support loading of a LZO encoded initial ramdisk or cpio buffer > @@ -100,7 +95,6 @@ config RD_LZO > config RD_LZ4 > bool "Support initial ramdisk/ramfs compressed using LZ4" > default y > - depends on BLK_DEV_INITRD > select DECOMPRESS_LZ4 > help > Support loading of a LZ4 encoded initial ramdisk or cpio buffer
diff --git a/usr/Kconfig b/usr/Kconfig index a6b68503d177..72f50a21c051 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -54,7 +54,6 @@ config INITRAMFS_ROOT_GID config RD_GZIP bool "Support initial ramdisk/ramfs compressed using gzip" - depends on BLK_DEV_INITRD default y select DECOMPRESS_GZIP help @@ -64,7 +63,6 @@ config RD_GZIP config RD_BZIP2 bool "Support initial ramdisk/ramfs compressed using bzip2" default y - depends on BLK_DEV_INITRD select DECOMPRESS_BZIP2 help Support loading of a bzip2 encoded initial ramdisk or cpio buffer @@ -73,7 +71,6 @@ config RD_BZIP2 config RD_LZMA bool "Support initial ramdisk/ramfs compressed using LZMA" default y - depends on BLK_DEV_INITRD select DECOMPRESS_LZMA help Support loading of a LZMA encoded initial ramdisk or cpio buffer @@ -81,7 +78,6 @@ config RD_LZMA config RD_XZ bool "Support initial ramdisk/ramfs compressed using XZ" - depends on BLK_DEV_INITRD default y select DECOMPRESS_XZ help @@ -91,7 +87,6 @@ config RD_XZ config RD_LZO bool "Support initial ramdisk/ramfs compressed using LZO" default y - depends on BLK_DEV_INITRD select DECOMPRESS_LZO help Support loading of a LZO encoded initial ramdisk or cpio buffer @@ -100,7 +95,6 @@ config RD_LZO config RD_LZ4 bool "Support initial ramdisk/ramfs compressed using LZ4" default y - depends on BLK_DEV_INITRD select DECOMPRESS_LZ4 help Support loading of a LZ4 encoded initial ramdisk or cpio buffer
init/Kconfig includes usr/Kconfig inside the "if BLK_DEV_INITRD" ... "endif" block: if BLK_DEV_INITRD source "usr/Kconfig" endif Hence, all the defines in usr/Kconfig depend on BLK_DEV_INITRD. Remove the redundant "depends on BLK_DEV_INITRD". Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Changes in v2: None usr/Kconfig | 6 ------ 1 file changed, 6 deletions(-)