lkml.org 
[lkml]   [2020]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: x86/build] x86/Kconfig: Make CMDLINE_OVERRIDE depend on non-empty CMDLINE
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 645e64662af4dba9eb4a80bbab2663dd22018312
Gitweb: https://git.kernel.org/tip/645e64662af4dba9eb4a80bbab2663dd22018312
Author: Anders Roxell <anders.roxell@linaro.org>
AuthorDate: Fri, 24 Jan 2020 12:46:15 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 26 Feb 2020 13:31:46 +01:00

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
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index beea770..b414192 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.
\
 
 \ /
  Last update: 2020-02-26 13:38    [W:0.045 / U:1.680 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site