Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dff89a9 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Fix early cmdline for CMDLINE_FORCE 



This patch fixed parsing early parameters because
current implementation does that early parse DTS
command line and then parse CMDLINE line which is compiled-in.

For case that DTS doesn't contain command line is
copied command line from kernel with is done in prom.c
that's why I can remove it from machine_early_init.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 6e3d4e1d

arch/microblaze/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -563,7 +563,9 @@ static int __init early_init_dt_scan_chosen(unsigned long node, 
		strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));



#ifdef CONFIG_CMDLINE

#ifndef CONFIG_CMDLINE_FORCE

	if (p == NULL || l == 0 || (l == 1 && (*p) == 0))

#endif

		strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif /* CONFIG_CMDLINE */

arch/microblaze/kernel/setup.c

+1 −8
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ char cmd_line[COMMAND_LINE_SIZE]; 


void __init setup_arch(char **cmdline_p)

{

#ifdef CONFIG_CMDLINE_FORCE

	strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

	strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif

	*cmdline_p = cmd_line;



	console_verbose();
@@ -106,10 +102,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, 
	memset(__bss_start, 0, __bss_stop-__bss_start);

	memset(_ssbss, 0, _esbss-_ssbss);



	/*

	 * Copy command line passed from bootloader, or use default

	 * if none provided, or forced

	 */

	/* Copy command line passed from bootloader */

#ifndef CONFIG_CMDLINE_BOOL

	if (cmdline && cmdline[0] != '\0')

		strlcpy(cmd_line, cmdline, COMMAND_LINE_SIZE);