[PATCH 14/35] MIPS: lantiq: Cleanup firmware support for the lantiq platform.
From: Steven J. Hill <hidden>
Date: 2012-06-05 21:56:13
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: "Steven J. Hill" <redacted> Signed-off-by: Steven J. Hill <redacted> --- arch/mips/lantiq/prom.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index d185e84..aa9da9e 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c@@ -9,9 +9,9 @@ #include <linux/export.h> #include <linux/clk.h> #include <linux/of_platform.h> -#include <asm/bootinfo.h> #include <asm/time.h> +#include <asm/fw/fw.h> #include <lantiq.h> #include "prom.h"
@@ -36,24 +36,6 @@ void prom_free_prom_memory(void) { } -static void __init prom_init_cmdline(void) -{ - int argc = fw_arg0; - char **argv = (char **) KSEG1ADDR(fw_arg1); - int i; - - arcs_cmdline[0] = '\0'; - - for (i = 0; i < argc; i++) { - char *p = (char *) KSEG1ADDR(argv[i]); - - if (CPHYSADDR(p) && *p) { - strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); - strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); - } - } -} - void __init plat_mem_setup(void) { ioport_resource.start = IOPORT_RESOURCE_START;
@@ -78,7 +60,7 @@ void __init prom_init(void) soc_info.name, soc_info.rev_type); soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0'; pr_info("SoC: %s\n", soc_info.sys_type); - prom_init_cmdline(); + fw_init_cmdline(); #if defined(CONFIG_MIPS_MT_SMP) if (register_vsmp_smp_ops())
--
1.7.10.3