RISC-V: Remove duplicate command-line parsing logic
PATCH 1/2 RISC-V: Remove duplicate command-line parsing logic
From: Michael Clark <[email protected]>
builtin_cmdline handling is present in drivers/of/fdt.c so the duplicate logic in arch/riscv/setup.c results in duplication of the builtin command line. e.g. CONFIG_CMDLINE="root=/dev/vda ro" gets appended twice and gives "root=/dev/vda ro root=/dev/vda ro"
Before this patch:
[ 0.000000] Kernel command line: root=/dev/vda ro root=/dev/vda ro
After this patch:
[ 0.000000] Kernel command line: root=/dev/vda ro
Signed-off-by Michael Clark <[email protected]>
Signed-off-by Palmer Dabbelt <[email protected]>
--- arch/riscv/kernel/setup.c | 16 ---------------- 1 file changed, 16 deletions(-)
arch/riscv/kernel/setup.c +0 -16
@@ -49,10 +49,6 @@ struct screen_info screen_info = { };#endif -#ifdef CONFIG_CMDLINE_BOOL -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE ] =CONFIG_CMDLINE ; -#endif /* CONFIG_CMDLINE_BOOL */ -unsigned long va_pa_offset;EXPORT_SYMBOL (va_pa_offset);unsigned long pfn_base;
@@ -208,18 +204,6 @@ static void __init setup_bootmem(void)void __init setup_arch (char **cmdline_p) { -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); -#else -if (builtin_cmdline[0 ] !='\0' ) { -/* Append bootloader command line to built-in */ -strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE ); -strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); - } -#endif /* CONFIG_CMDLINE_OVERRIDE */ -#endif /* CONFIG_CMDLINE_BOOL */ *cmdline_p = boot_command_line;parse_early_param ();
Signature · 1 line
2.13.6
PATCH 2/2 RISC-V: Remove mem_end command line processing
This is just some cruft left over from before the port converted to device tree. The right way to handle memory regions is to specify them in the device tree, which BBL (our simplest bootloader) is already capable of doing. This patch simply removes the cruft.
Signed-off-by Palmer Dabbelt <[email protected]>
--- arch/riscv/kernel/setup.c | 19 ------------------- 1 file changed, 19 deletions(-)
arch/riscv/kernel/setup.c +0 -19
@@ -149,25 +149,6 @@ void __init sbi_save(unsigned int hartid, void *dtb)early_init_dt_scan (__va (dtb)); } -/* -* Allow the user to manually add a memory region (in case DTS is broken); -* "mem_end=nn[KkMmGg]" -*/ -static int __init mem_end_override (char *p) -{ -resource_size_t base, end; - -if (!p) -return -EINVAL ; - base = (uintptr_t )__pa (PAGE_OFFSET ); - end =memparse (p, &p) &PMD_MASK ; -if (end ==0 ) -return -EINVAL ; -memblock_add (base, end - base); -return 0 ; -} -early_param ("mem_end" , mem_end_override); -static void __init setup_bootmem (void ) {struct memblock_region *reg;
Signature · 1 line
2.13.6