Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5836757..251aac1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1338,7 +1338,7 @@ endif
 
 config BOOT_CONFIG
        bool "Boot config support"
-       select BLK_DEV_INITRD
+       select BLK_DEV_INITRD if !BOOT_CONFIG_EMBED
        help
          Extra boot config allows system admin to pass a config file as
          complemental extension of kernel cmdline when booting.
@@ -1348,6 +1348,25 @@ config BOOT_CONFIG
 
          If unsure, say Y.
 
+config BOOT_CONFIG_EMBED
+       bool "Embed bootconfig file in the kernel"
+       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
+         help you by embedding a bootconfig file while building the kernel.
+
+         If unsure, say N.
+
+config BOOT_CONFIG_EMBED_FILE
+       string "Embedded bootconfig file path"
+       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.
+
 config INITRAMFS_PRESERVE_MTIME
        bool "Preserve cpio archive mtimes in initramfs"
        default y