aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2016-12-01 17:16:02 -0800
committerGeoff Levand <geoff@infradead.org>2016-12-02 10:08:05 -0800
commit4908fed2903e063d14f162dab358710c9a077703 (patch)
tree16272cda02a69df824ba8a90552322ece16bb6ab
parente5517c2a5a49ed5e99047008629f1cd60246ea0e (diff)
downloadlinux-kexec-4908fed2903e063d14f162dab358710c9a077703.tar.gz
arm64: Add CMDLINE_EXTENDfor-merge-cmdline
Signed-off-by: Geoff Levand <geoff@infradead.org>
-rw-r--r--arch/arm64/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 969ef880d234e..51f75451c5cce 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -949,6 +949,12 @@ config CMDLINE
entering them here. As a minimum, you should specify the the
root device (e.g. root=/dev/nfs).
+config CMDLINE_EXTEND
+ bool "Extend bootloader kernel arguments"
+ help
+ The command-line arguments provided by the boot loader will be
+ appended to the default kernel command string.
+
config CMDLINE_FORCE
bool "Always use the default kernel command string"
help