From 17376b52e962edb92e4133d60b9c8d208694b09d Mon Sep 17 00:00:00 2001
From: Anders Roxell <anders.roxell@linaro.org>
Date: Thu, 23 Jan 2020 12:51:03 +0100
Subject: [PATCH] x86: Kconfig: make CMDLINE_OVERRIDE depend on CMDLINE

When trying to boot an allmodconfig kernel, it doesn't boot if you don't
pass in a CONFIG_CMDLINE="...".

Rework so that CONFIG_CMDLINE_OVERRIDE gets set only if CONFIG_CMDLINE
is set to something except an empty string.

Signed-off-by: Anders Roxell <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 f2dcd9ab6ef6..598b6325a027 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2447,7 +2447,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.
-- 
2.20.1

