powerpc: convert to generic builtin command line
PATCH 3/4 powerpc: convert to generic builtin command line
This updates the powerpc code to use the CONFIG_GENERIC_CMDLINE option.
[[email protected]: add strlcat to prom_init_check.sh whitelist]
Cc Daniel Walker <[email protected]>
Cc Daniel Walker <[email protected]>
Signed-off-by Daniel Walker <[email protected]>
Signed-off-by Maksym Kokhan <[email protected]>
--- arch/powerpc/Kconfig | 23 +---------------------- arch/powerpc/kernel/prom_init.c | 8 ++++---- arch/powerpc/kernel/prom_init_check.sh | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-)
arch/powerpc/Kconfig +1 -22
@@ -173,6 +173,7 @@ config PPC select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL + select GENERIC_CMDLINE select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KGDB
@@ -780,28 +781,6 @@ config PPC_DENORMALISATION Add support for handling denormalisation of single precision values. Useful for bare metal only. If unsure say Y here. -config CMDLINE_BOOL - bool "Default bootloader kernel arguments" - -config CMDLINE - string "Initial kernel command string" - depends on CMDLINE_BOOL - default "console=ttyS0,9600 console=tty0 root=/dev/sda2" - help - On some platforms, there is currently no way for the boot loader to - pass arguments to the kernel. For these platforms, you can supply - some command-line options at build time by entering them here. In - most cases you will need to specify the root device here. - -config CMDLINE_FORCE - bool "Always use the default kernel command string" - depends on CMDLINE_BOOL - help - Always use the default kernel command string, even if the boot - loader passes other arguments to the kernel. - This is useful if you cannot or don't want to change the - command-line options your boot loader passes to the kernel. - config EXTRA_TARGETS string "Additional default image types" help
arch/powerpc/kernel/prom_init.c +4 -4
@@ -30,6 +30,7 @@#include <linux/delay.h> #include <linux/initrd.h> #include <linux/bitops.h> +#include <linux/cmdline.h> #include <asm/prom.h> #include <asm/rtas.h> #include <asm/page.h>
@@ -637,11 +638,10 @@ static void __init early_cmdline_parse(void) p = prom_cmd_line;if ((long )prom.chosen >0 ) l =prom_getprop (prom.chosen,"bootargs" , p,COMMAND_LINE_SIZE -1 ); -#ifdef CONFIG_CMDLINE +if (l <=0 || p[0 ] =='\0' )/* dbl check */ -strlcpy (prom_cmd_line, -CONFIG_CMDLINE ,sizeof (prom_cmd_line)); -#endif /* CONFIG_CMDLINE */ +cmdline_add_builtin_section (prom_cmd_line,NULL ,sizeof (prom_cmd_line), __prombss); +prom_printf ("command line: %s\n" , prom_cmd_line);#ifdef CONFIG_PPC64
arch/powerpc/kernel/prom_init_check.sh +1 -1
@@ -18,7 +18,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush _end enter_prom memcpy memset reloc_offset __secondary_hold -__secondary_hold_acknowledge __secondary_hold_spinloop __start +__secondary_hold_acknowledge __secondary_hold_spinloop __start strlcat strcmp strcpy strlcpy strlen strncmp strstr kstrtobool logo_linux_clut224 reloc_got2 kernstart_addr memstart_addr linux_banner _stext __prom_init_toc_start __prom_init_toc_end btext_setup_display TOC."
Signature · 1 line
2.19.1