Commit 8e029eb0 authored Feb 25, 2020 by Paul Cercueil Committed by Thomas Bogendoerfer Feb 27, 2020

MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling



The CONFIG_MIPS_CMDLINE_DTB_EXTEND option is used so that the kernel
arguments provided in the 'bootargs' property in devicetree are extended
with the kernel arguments provided by the bootloader.

The code was broken, as it didn't actually take any of the kernel
arguments provided in devicetree when that option was set.

Fixes: 7784cac6 ("MIPS: cmdline: Clean up boot_command_line initialization")
Cc: stable@vger.kernel.org
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

parent 3234f4ed

arch/mips/kernel/setup.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -605,7 +605,8 @@ static void __init bootcmdline_init(char **cmdline_p)
		* If we're configured to take boot arguments from DT, look for those
		* now.
		*/
		if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB))
		if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) \|\|
		IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND))
		of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs);
		#endif

Admin message