MIPS: ingenic: Use common cmdline handling code

jz4740_init_cmdline appends all arguments from argv (in fw_arg1) to
arcs_cmdline, up to argc (in fw_arg0). The common code in
fw_init_cmdline will do the exact same thing when run on a system where
fw_arg0 isn't a pointer to kseg0 (it'll also set _fw_envp but we don't
use it). Remove the custom implementation & use the generic code.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Reviewed-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Maarten ter Huurne <maarten@treewalker.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18484/
Signed-off-by: James Hogan <jhogan@kernel.org>

diff --git a/arch/mips/jz4740/prom.c b/arch/mips/jz4740/prom.c
index 47e857194ce66aaa5e1b8428c14871d630745fac..a62dd8e6ecf9cd9f314f2e97cc2e511cbbb7b501 100644 (file)
--- a/arch/mips/jz4740/prom.c
+++ b/arch/mips/jz4740/prom.c
@@ -20,33 +20,13 @@
 #include <linux/serial_reg.h>
 
 #include <asm/bootinfo.h>
+#include <asm/fw/fw.h>
 #include <asm/mach-jz4740/base.h>
 
-static __init void jz4740_init_cmdline(int argc, char *argv[])
-{
-       unsigned int count = COMMAND_LINE_SIZE - 1;
-       int i;
-       char *dst = &(arcs_cmdline[0]);
-       char *src;
-
-       for (i = 1; i < argc && count; ++i) {
-               src = argv[i];
-               while (*src && count) {
-                       *dst++ = *src++;
-                       --count;
-               }
-               *dst++ = ' ';
-       }
-       if (i > 1)
-               --dst;
-
-       *dst = 0;
-}
-
 void __init prom_init(void)
 {
-       jz4740_init_cmdline((int)fw_arg0, (char **)fw_arg1);
        mips_machtype = MACH_INGENIC_JZ4740;
+       fw_init_cmdline();
 }
 
 void __init prom_free_prom_memory(void)