summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-10-08 23:28:51 +0200
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 07:45:23 +0100
commit4248f7f121b755b272a3c77a1a5601faa6004350 (patch)
tree98c77d5bb2aa60744289002ebe4aff2a26cb9e6a
parentMIPS: ralink: add a bootrom dumper module (diff)
downloadlinux-4248f7f121b755b272a3c77a1a5601faa6004350.tar.xz
linux-4248f7f121b755b272a3c77a1a5601faa6004350.zip
MIPS: ralink: copy the commandline from the devicetree
This is a regression caused by: commit afb46f7996e91aeb36e07bc92cf96e8045bec00e Author: Rob Herring <robh@kernel.org> Date: Wed Apr 2 19:07:24 2014 -0500 mips: ralink: convert to use unflatten_and_copy_device_tree Make the of init code reuse the cmdline defined inside the dts. Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/8008/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/ralink/of.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index f9eda5d8f82c..0d30dcd63246 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -74,6 +74,8 @@ void __init plat_mem_setup(void)
*/
__dt_setup_arch(__dtb_start);
+ strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+
of_scan_flat_dt(early_init_dt_find_memory, NULL);
if (memory_dtb)
of_scan_flat_dt(early_init_dt_scan_memory, NULL);