mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-28 09:31:14 +00:00
[PATCH] initramfs should not depend on CONFIG_BLOCK
initramfs ended up depending on BLOCK: INITRAMFS_SOURCE <-- BLK_DEV_INITRD <-- BLOCK This inhibits use of customized-initramfs-over-ramfs without block layer (ramfs would still be enabled), useful in embedded applications. Move BLK_DEV_INITRD out of 'drivers/block/Kconfig' and into 'init/Kconfig', make it unconditional. Signed-off-by: Dimitri Gorokhovik <dimitri.gorokhovik@free.fr> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
de69fee82c
commit
f991633de6
2 changed files with 16 additions and 16 deletions
|
@ -406,22 +406,6 @@ config BLK_DEV_RAM_BLOCKSIZE
|
||||||
setups function - apparently needed by the rd_load_image routine
|
setups function - apparently needed by the rd_load_image routine
|
||||||
that supposes the filesystem in the image uses a 1024 blocksize.
|
that supposes the filesystem in the image uses a 1024 blocksize.
|
||||||
|
|
||||||
config BLK_DEV_INITRD
|
|
||||||
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
|
|
||||||
depends on BROKEN || !FRV
|
|
||||||
help
|
|
||||||
The initial RAM filesystem is a ramfs which is loaded by the
|
|
||||||
boot loader (loadlin or lilo) 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/initrd.txt> 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.
|
|
||||||
|
|
||||||
config CDROM_PKTCDVD
|
config CDROM_PKTCDVD
|
||||||
tristate "Packet writing on CD/DVD media"
|
tristate "Packet writing on CD/DVD media"
|
||||||
depends on !UML
|
depends on !UML
|
||||||
|
|
16
init/Kconfig
16
init/Kconfig
|
@ -304,6 +304,22 @@ config RELAY
|
||||||
|
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
|
config BLK_DEV_INITRD
|
||||||
|
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
|
||||||
|
depends on BROKEN || !FRV
|
||||||
|
help
|
||||||
|
The initial RAM filesystem is a ramfs which is loaded by the
|
||||||
|
boot loader (loadlin or lilo) 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/initrd.txt> 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
|
if BLK_DEV_INITRD
|
||||||
|
|
||||||
source "usr/Kconfig"
|
source "usr/Kconfig"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue