[PATCH 09/33] MIPS: Emma: Cleanup firmware support for the Emma platform.
From: Steven J. Hill <hidden>
Date: 2012-06-26 04:46:06
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: "Steven J. Hill" <redacted> Signed-off-by: Steven J. Hill <redacted> --- arch/mips/emma/common/prom.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c
index cae4225..5228584 100644
--- a/arch/mips/emma/common/prom.c
+++ b/arch/mips/emma/common/prom.c@@ -25,7 +25,7 @@ #include <linux/bootmem.h> #include <asm/addrspace.h> -#include <asm/bootinfo.h> +#include <asm/fw/fw.h> #include <asm/emma/emma2rh.h> const char *get_system_type(void)
@@ -40,22 +40,7 @@ const char *get_system_type(void) /* [jsun@junsun.net] PMON passes arguments in C main() style */ void __init prom_init(void) { - int argc = fw_arg0; - char **arg = (char **)fw_arg1; - int i; - - /* if user passes kernel args, ignore the default one */ - if (argc > 1) - arcs_cmdline[0] = '\0'; - - /* arg[0] is "g", the rest is boot parameters */ - for (i = 1; i < argc; i++) { - if (strlen(arcs_cmdline) + strlen(arg[i]) + 1 - >= sizeof(arcs_cmdline)) - break; - strcat(arcs_cmdline, arg[i]); - strcat(arcs_cmdline, " "); - } + fw_init_cmdline(); #ifdef CONFIG_NEC_MARKEINS add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
--
1.7.10.3