Skip to contentSkip to conversation

risc-v: Fix issue ignoring CONFIG_CMDLINE_OVERRIDE

RFC/PATCH Moritz Fischer 1 participant 1 message Mar 13, 2018 RISC-V

lore
Share & tools
lore
#0 lore raw

Fix issue where CONFIG_CMDLINE_OVERRIDE is being
ignored.

---

Hi all,

not sure this is the right fix, hopefully someone can chime in and come up with the correct solution.

Thanks,

Moritz

---
 arch/riscv/kernel/setup.c | 6 ++++++
 1 file changed, 6 insertions(+)
arch/riscv/kernel/setup.c +6 -0
index 09f7064e898c..e24191a0c244 100644
@@ -38,6 +38,8 @@
 #include <asm/tlbflush.h>
 #include <asm/thread_info.h>
 
+static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
+
 #ifdef CONFIG_DUMMY_CONSOLE
 struct screen_info screen_info = {
 	.orig_video_lines	= 30,
@@ -194,7 +196,11 @@ static void __init setup_bootmem(void)
 
 void __init setup_arch(char **cmdline_p)
 {
+#if defined(CONFIG_CMDLINE_OVERRIDE)
+	*cmdline_p = default_command_line;
+#else
 	*cmdline_p = boot_command_line;
+#endif
 
 	parse_early_param();
 
Signature · 1 line
2.16.2