From 2b2b4074e647f4e88c9601e14f834f4a3a379d2a Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 24 Nov 2014 16:40:04 +0800 Subject: nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL If NIOS2_CMDLINE_IGNORE_DTB is selected but CMDLINE_BOOL isn't and thus CONFIG_CMDLINE is not defined, the build fails with the following error: arch/nios2/kernel/setup.c: In function 'nios2_boot_init': arch/nios2/kernel/setup.c:131:30: error: 'CONFIG_CMDLINE' undeclared (first use in this function) strncpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); This can be reproduced using randconfig with KCONFIG_SEED=0xE5B8749E, i.e. 'make KCONFIG_SEED=0xE5B8749E ARCH=nios2 randconfig'. Fix this by letting NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL, so we actually have a default kernel command string to fall back to. Signed-off-by: Tobias Klauser Acked-by: Ley Foon Tan --- arch/nios2/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index a0ea080f8a5d..2361acf6d2b1 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -119,6 +119,7 @@ config CMDLINE_FORCE config NIOS2_CMDLINE_IGNORE_DTB bool "Ignore kernel command string from DTB" + depends on CMDLINE_BOOL depends on !CMDLINE_FORCE default y help -- cgit v1.2.3-59-g8ed1b