mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

powerpc: remove CONFIG_CMDLINE #ifdef mess 

This patch makes CONFIG_CMDLINE defined at all time. It avoids
having to enclose related code inside #ifdef CONFIG_CMDLINE

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2019-04-26 16:23:27 +00:00 committed by Michael Ellerman
parent 26deb04342
commit cbe46bd4f5
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/Kconfig
View File

@ -831,9 +831,9 @@ config CMDLINE_BOOL
bool "Default bootloader kernel arguments" bool "Default bootloader kernel arguments"
config CMDLINE config CMDLINE
string "Initial kernel command string" string "Initial kernel command string" if CMDLINE_BOOL
depends on CMDLINE_BOOL default "console=ttyS0,9600 console=tty0 root=/dev/sda2" if CMDLINE_BOOL
default "console=ttyS0,9600 console=tty0 root=/dev/sda2" default ""
help help
On some platforms, there is currently no way for the boot loader to On some platforms, there is currently no way for the boot loader to
pass arguments to the kernel. For these platforms, you can supply pass arguments to the kernel. For these platforms, you can supply

9
arch/powerpc/kernel/prom_init.c
View File

@ -631,17 +631,14 @@ static void __init early_cmdline_parse(void)
const char *opt; const char *opt;
char *p; char *p;
int l __maybe_unused = 0; int l = 0;
prom_cmd_line[0] = 0; prom_cmd_line[0] = 0;
p = prom_cmd_line; p = prom_cmd_line;
if ((long)prom.chosen > 0) if ((long)prom.chosen > 0)
l = prom_getprop(prom.chosen, "bootargs", p, COMMAND_LINE_SIZE-1); l = prom_getprop(prom.chosen, "bootargs", p, COMMAND_LINE_SIZE-1);
#ifdef CONFIG_CMDLINE if (IS_ENABLED(CONFIG_CMDLINE_BOOL) && (l <= 0 || p[0] == '\0')) /* dbl check */
if (l <= 0 || p[0] == '\0') /* dbl check */ strlcpy(prom_cmd_line, CONFIG_CMDLINE, sizeof(prom_cmd_line));
strlcpy(prom_cmd_line,
CONFIG_CMDLINE, sizeof(prom_cmd_line));
#endif /* CONFIG_CMDLINE */
prom_printf("command line: %s\n", prom_cmd_line); prom_printf("command line: %s\n", prom_cmd_line);
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64