[PATCH v4 10/20] hexagon: Convert to GENERIC_CMDLINE
From: Christophe Leroy <hidden>
Date: 2021-04-02 15:19:14
Also in:
linux-arch, linux-arm-kernel, linux-mips, linux-mm, linux-riscv, linux-sh, linuxppc-dev, lkml, sparclinux
Subsystem:
qualcomm hexagon architecture, the rest · Maintainers:
Brian Cain, Linus Torvalds
This converts the architecture to GENERIC_CMDLINE. Signed-off-by: Christophe Leroy <redacted> --- arch/hexagon/Kconfig | 11 +---------- arch/hexagon/kernel/setup.c | 10 ++-------- 2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 44a409967af1..1e69c99bae6b 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig@@ -18,6 +18,7 @@ config HEXAGON select HAVE_PERF_EVENTS # GENERIC_ALLOCATOR is used by dma_alloc_coherent() select GENERIC_ALLOCATOR + select GENERIC_CMDLINE select GENERIC_IRQ_SHOW select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK
@@ -91,16 +92,6 @@ config HEXAGON_ARCH_VERSION int "Architecture version" default 2 -config CMDLINE - string "Default kernel command string" - default "" - help - On some platforms, there is currently no way for the boot loader - to pass arguments to the kernel. For these, you should supply some - command-line options at build time by entering them here. At a - minimum, you should specify the memory size and the root device - (e.g., mem=64M root=/dev/nfs). - config SMP bool "Multi-Processing support" help
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
index 1880d9beaf2b..78641ce219e2 100644
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c@@ -13,6 +13,7 @@ #include <linux/seq_file.h> #include <linux/console.h> #include <linux/of_fdt.h> +#include <linux/cmdline.h> #include <asm/io.h> #include <asm/sections.h> #include <asm/setup.h>
@@ -22,7 +23,6 @@ #include <asm/time.h> char cmd_line[COMMAND_LINE_SIZE]; -static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; int on_simulator;
@@ -38,8 +38,6 @@ void calibrate_delay(void) void __init setup_arch(char **cmdline_p) { - char *p = &external_cmdline_buffer; - /* * These will eventually be pulled in via either some hypervisor * or devicetree description. Hardwiring for now.
@@ -65,11 +63,7 @@ void __init setup_arch(char **cmdline_p) else on_simulator = 0; - if (p[0] != '\0') - strlcpy(boot_command_line, p, COMMAND_LINE_SIZE); - else - strlcpy(boot_command_line, default_command_line, - COMMAND_LINE_SIZE); + cmdline_build(boot_command_line, external_cmdline_buffer); /* * boot_command_line and the value set up by setup_arch
--
2.25.0