]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL
authorTobias Klauser <tklauser@distanz.ch>
Mon, 24 Nov 2014 08:40:04 +0000 (16:40 +0800)
committerLey Foon Tan <lftan@altera.com>
Mon, 8 Dec 2014 04:56:14 +0000 (12:56 +0800)
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>
arch/nios2/Kconfig

index a0ea080f8a5d41da0c90e06eaed3133947f34f1a..2361acf6d2b1abb195c3f2daff5c64df88400a94 100644 (file)
@@ -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