diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2020-01-24 12:46:15 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-02-26 13:31:46 +0100 |
| commit | 645e64662af4dba9eb4a80bbab2663dd22018312 (patch) | |
| tree | 8620f21e85a2c474b0b32f1871aa49fd896b743a | |
| parent | f8788d86ab28f61f7b46eb6be375f8a726783636 (diff) | |
| download | linux-645e64662af4dba9eb4a80bbab2663dd22018312.tar.bz2 | |
x86/Kconfig: Make CMDLINE_OVERRIDE depend on non-empty CMDLINE
When trying to boot an allmodconfig kernel that is built with
KCONFIG_ALLCONFIG=$(pwd)/arch/x86/configs/x86_64_defconfig, it doesn't
boot since CONFIG_CMDLINE_OVERRIDE gets enabled and that requires the
user to pass the full cmdline to CONFIG_CMDLINE.
Change so that CONFIG_CMDLINE_OVERRIDE gets set only if CONFIG_CMDLINE
is set to something except an empty string.
[ bp: touchup. ]
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200124114615.11577-1-anders.roxell@linaro.org
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index beea77046f9b..b41419231b90 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2418,7 +2418,7 @@ config CMDLINE config CMDLINE_OVERRIDE bool "Built-in command line overrides boot loader arguments" - depends on CMDLINE_BOOL + depends on CMDLINE_BOOL && CMDLINE != "" ---help--- Set this option to 'Y' to have the kernel ignore the boot loader command line, and use ONLY the built-in command line. |