]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
MIPS: ralink: copy the commandline from the devicetree
authorJohn Crispin <blogic@openwrt.org>
Wed, 8 Oct 2014 21:28:51 +0000 (23:28 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 24 Nov 2014 06:45:23 +0000 (07:45 +0100)
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>
arch/mips/ralink/of.c

index f9eda5d8f82cd54681efbdf65c4f55123a3dfeed..0d30dcd6324623a3ed6dc635ec653a2619228132 100644 (file)
@@ -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);