]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling
authorPaul Cercueil <paul@crapouillou.net>
Tue, 25 Feb 2020 15:28:09 +0000 (12:28 -0300)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Thu, 27 Feb 2020 12:52:06 +0000 (13:52 +0100)
commit54e4ac4b9a7cd7e989524115f669b9e9459aba1c
tree81f15bc743188722e679b99c63a428e4e252a951
parentfd5925a0f6e6623389698a845545715a713500c6
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: f430d78f5282 ("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>
arch/mips/kernel/setup.c