[lkml]   [2020]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 5.5 104/151] MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling
From: Paul Cercueil <>

commit 8e029eb0bcd6a7fab6dc9191152c085784c31ee6 upstream.

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: 7784cac69735 ("MIPS: cmdline: Clean up boot_command_line initialization")
Signed-off-by: Paul Cercueil <>
Signed-off-by: Thomas Bogendoerfer <>
Signed-off-by: Greg Kroah-Hartman <>

arch/mips/kernel/setup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -606,7 +606,8 @@ static void __init bootcmdline_init(char
* If we're configured to take boot arguments from DT, look for those
* now.
of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs);

 \ /
  Last update: 2020-03-17 12:12    [W:0.356 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site