]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
arm64: Kconfig: make CMDLINE_FORCE depend on CMDLINE
authorAnders Roxell <anders.roxell@linaro.org>
Mon, 11 Nov 2019 08:59:56 +0000 (09:59 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 11 Nov 2019 18:22:57 +0000 (18:22 +0000)
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>
arch/arm64/Kconfig

index 3e53441ee067970b30f219a50f6cb6ea23d53518..8a0800e5be9d948980d5027915b36bc7021411f4 100644 (file)
@@ -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.