This is cleanup after initrd removal Signed-off-by: Askar Safin <safinaskar@xxxxxxxxx> --- drivers/block/Kconfig | 7 ++----- init/Kconfig | 18 +++++++----------- usr/Kconfig | 42 +++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 8cf06e40f61c..a268ac3dd304 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -225,9 +225,7 @@ config BLK_DEV_RAM Saying Y here will allow you to use a portion of your RAM memory as a block device, so that you can make file systems on it, read and write to it and do all the other things that you can do with normal - block devices (such as hard drives). It is usually used to load and - store a copy of a minimal root file system off of a floppy into RAM - during the initial install of Linux. + block devices (such as hard drives). For details, read <file:Documentation/admin-guide/blockdev/ramdisk.rst>. @@ -244,8 +242,7 @@ config BLK_DEV_RAM_COUNT depends on BLK_DEV_RAM help The default value is 16 RAM disks. Change this if you know what you - are doing. If you boot from a filesystem that needs to be extracted - in memory, you will need at least one RAM disk (e.g. root on cramfs). + are doing. config BLK_DEV_RAM_SIZE int "Default RAM disk size (kbytes)" diff --git a/init/Kconfig b/init/Kconfig index 0263c08960bc..1c371dca7fd4 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1435,18 +1435,14 @@ config RELAY If unsure, say N. config BLK_DEV_INITRD - bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" + bool "Initial RAM filesystem (initramfs) support" help - The initial RAM filesystem is a ramfs which is loaded by the - boot loader (loadlin or lilo) and that is mounted as root + The initial RAM filesystem is a ramfs or tmpfs which is loaded by the + boot loader and that is mounted as root before the normal boot procedure. It is typically used to load modules needed to mount the "real" root file system, etc. See <file:Documentation/filesystems/ramfs-rootfs-initramfs.rst> for details. - If RAM disk support (BLK_DEV_RAM) is also included, this - also enables initial RAM disk (initrd) support and adds - 15 Kbytes (more on some other architectures) to the kernel size. - If unsure say Y. if BLK_DEV_INITRD @@ -1485,8 +1481,8 @@ config BOOT_CONFIG_EMBED depends on BOOT_CONFIG help Embed a bootconfig file given by BOOT_CONFIG_EMBED_FILE in the - kernel. Usually, the bootconfig file is loaded with the initrd - image. But if the system doesn't support initrd, this option will + kernel. Usually, the bootconfig file is loaded with the initramfs. + But if the system doesn't support initramfs, this option will help you by embedding a bootconfig file while building the kernel. If unsure, say N. @@ -1496,8 +1492,8 @@ config BOOT_CONFIG_EMBED_FILE depends on BOOT_CONFIG_EMBED help Specify a bootconfig file which will be embedded to the kernel. - This bootconfig will be used if there is no initrd or no other - bootconfig in the initrd. + This bootconfig will be used if there is no initramfs or no other + bootconfig in the initramfs. config INITRAMFS_PRESERVE_MTIME bool "Preserve cpio archive mtimes in initramfs" diff --git a/usr/Kconfig b/usr/Kconfig index 9279a2893ab0..8899353bd7d5 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -27,7 +27,7 @@ config INITRAMFS_FORCE depends on CMDLINE_EXTEND || CMDLINE_FORCE help This option causes the kernel to ignore the initramfs image - (or initrd image) passed to it by the bootloader. This is + passed to it by the bootloader. This is analogous to CMDLINE_FORCE, which is found on some architectures, and is useful if you cannot or don't want to change the image your bootloader passes to the kernel. @@ -53,59 +53,59 @@ config INITRAMFS_ROOT_GID If you are not sure, leave it set to "0". config RD_GZIP - bool "Support initial ramdisk/ramfs compressed using gzip" + bool "Support initial ramfs compressed using gzip" default y select DECOMPRESS_GZIP help - Support loading of a gzip encoded initial ramdisk or cpio buffer. + Support loading of a gzip encoded initial ramfs. If unsure, say Y. config RD_BZIP2 - bool "Support initial ramdisk/ramfs compressed using bzip2" + bool "Support initial ramfs compressed using bzip2" default y select DECOMPRESS_BZIP2 help - Support loading of a bzip2 encoded initial ramdisk or cpio buffer + Support loading of a bzip2 encoded initial ramfs. If unsure, say N. config RD_LZMA - bool "Support initial ramdisk/ramfs compressed using LZMA" + bool "Support initial ramfs compressed using LZMA" default y select DECOMPRESS_LZMA help - Support loading of a LZMA encoded initial ramdisk or cpio buffer + Support loading of a LZMA encoded initial ramfs. If unsure, say N. config RD_XZ - bool "Support initial ramdisk/ramfs compressed using XZ" + bool "Support initial ramfs compressed using XZ" default y select DECOMPRESS_XZ help - Support loading of a XZ encoded initial ramdisk or cpio buffer. + Support loading of a XZ encoded initial ramfs. If unsure, say N. config RD_LZO - bool "Support initial ramdisk/ramfs compressed using LZO" + bool "Support initial ramfs compressed using LZO" default y select DECOMPRESS_LZO help - Support loading of a LZO encoded initial ramdisk or cpio buffer + Support loading of a LZO encoded initial ramfs. If unsure, say N. config RD_LZ4 - bool "Support initial ramdisk/ramfs compressed using LZ4" + bool "Support initial ramfs compressed using LZ4" default y select DECOMPRESS_LZ4 help - Support loading of a LZ4 encoded initial ramdisk or cpio buffer + Support loading of a LZ4 encoded initial ramfs. If unsure, say N. config RD_ZSTD - bool "Support initial ramdisk/ramfs compressed using ZSTD" + bool "Support initial ramfs compressed using ZSTD" default y select DECOMPRESS_ZSTD help - Support loading of a ZSTD encoded initial ramdisk or cpio buffer. + Support loading of a ZSTD encoded initial ramfs. If unsure, say N. choice @@ -127,7 +127,7 @@ choice boot. Keep in mind that your build system needs to provide the appropriate - compression tool to compress the generated initram cpio file for + compression tool to compress the generated initramfs cpio file for embedding. If in doubt, select 'None' @@ -153,7 +153,7 @@ config INITRAMFS_COMPRESSION_BZIP2 booting. If you choose this, keep in mind that you need to have the bzip2 tool - available to be able to compress the initram. + available to be able to compress the initramfs. config INITRAMFS_COMPRESSION_LZMA bool "LZMA" @@ -166,7 +166,7 @@ config INITRAMFS_COMPRESSION_LZMA comparison to gzip. If you choose this, keep in mind that you may need to install the xz - or lzma tools to be able to compress the initram. + or lzma tools to be able to compress the initramfs. config INITRAMFS_COMPRESSION_XZ bool "XZ" @@ -179,7 +179,7 @@ config INITRAMFS_COMPRESSION_XZ slow. If you choose this, keep in mind that you may need to install the xz - tool to be able to compress the initram. + tool to be able to compress the initramfs. config INITRAMFS_COMPRESSION_LZO bool "LZO" @@ -191,7 +191,7 @@ config INITRAMFS_COMPRESSION_LZO is quite fast too. If you choose this, keep in mind that you may need to install the lzop - tool to be able to compress the initram. + tool to be able to compress the initramfs. config INITRAMFS_COMPRESSION_LZ4 bool "LZ4" @@ -213,7 +213,7 @@ config INITRAMFS_COMPRESSION_ZSTD decompress around the same speed as LZO, but slower than LZ4. If you choose this, keep in mind that you may need to install the zstd - tool to be able to compress the initram. + tool to be able to compress the initramfs. config INITRAMFS_COMPRESSION_NONE bool "None" -- 2.47.2