summaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorRabin Vincent2016-04-28 11:03:09 +0200
committerRalf Baechle2016-05-13 14:02:21 +0200
commited47e1533292e26baaec1b5ed7d425690289d5df (patch)
tree42a58be90dd95cd4f2f9667a011191432047ed9f /arch/mips/Kconfig
parentMIPS: Don't add leading spacing to command lines (diff)
downloadkernel-qcow2-linux-ed47e1533292e26baaec1b5ed7d425690289d5df.tar.gz
kernel-qcow2-linux-ed47e1533292e26baaec1b5ed7d425690289d5df.tar.xz
kernel-qcow2-linux-ed47e1533292e26baaec1b5ed7d425690289d5df.zip
MIPS: Add support for extending builtin cmdline
Allow the builtin command line to be extended by what the bootloader passes in. For example, the bootloader can pass specific arguments depending on the boot mode, and these should override the defaults in the builtin cmdline. The default MIPS_CMDLINE_FROM_BOOTLOADER option prepends the bootloader's cmdline to the builtin cmdline so is not suitable for this purpose. Signed-off-by: Rabin Vincent <rabinv@axis.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13181/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5cc5b621ae69..d10ed57ad418 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2930,6 +2930,10 @@ choice
config MIPS_CMDLINE_FROM_BOOTLOADER
bool "Bootloader kernel arguments if available"
+
+ config MIPS_CMDLINE_BUILTIN_EXTEND
+ depends on CMDLINE_BOOL
+ bool "Extend builtin kernel arguments with bootloader arguments"
endchoice
endmenu