aboutsummaryrefslogtreecommitdiffstats
path: root/arch/nios2/Kconfig
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-11-24 16:40:04 +0800
committerLey Foon Tan <lftan@altera.com>2014-12-08 12:56:14 +0800
commit2b2b4074e647f4e88c9601e14f834f4a3a379d2a (patch)
treec523b4530a6b6a4aa02ef030a135c15eca4ac097 /arch/nios2/Kconfig
parentnios2: Add missing NR_CPUS to Kconfig (diff)
downloadlinux-dev-2b2b4074e647f4e88c9601e14f834f4a3a379d2a.tar.xz
linux-dev-2b2b4074e647f4e88c9601e14f834f4a3a379d2a.zip
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 <tklauser@distanz.ch> Acked-by: Ley Foon Tan <lftan@altera.com>
Diffstat (limited to 'arch/nios2/Kconfig')
-rw-r--r--arch/nios2/Kconfig1
1 files changed, 1 insertions, 0 deletions
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