aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2019-11-11 09:59:56 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2019-11-11 18:22:57 +0000
commitf70c08e46d55126efa6d23e149f8472c178686f2 (patch)
treee692e62d32b19692d7027ce81c7c59823ed9f0c5 /arch
parentMAINTAINERS: Add arm64 selftests to the ARM64 PORT entry (diff)
downloadlinux-dev-f70c08e46d55126efa6d23e149f8472c178686f2.tar.xz
linux-dev-f70c08e46d55126efa6d23e149f8472c178686f2.zip
arm64: Kconfig: make CMDLINE_FORCE depend on CMDLINE
When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig CONFIG_CMDLINE_FORCE gets enabled. Which forces the user to pass the full cmdline to CONFIG_CMDLINE="...". Rework so that CONFIG_CMDLINE_FORCE gets set only if CONFIG_CMDLINE is set to something except an empty string. Suggested-by: John Garry <john.garry@huawei.com> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 3e53441ee067..8a0800e5be9d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1629,6 +1629,7 @@ config CMDLINE
config CMDLINE_FORCE
bool "Always use the default kernel command string"
+ depends on CMDLINE != ""
help
Always use the default kernel command string, even if the boot
loader passes other arguments to the kernel.