From: "Steven J. Hill" <sjhill@xxxxxxxx> Signed-off-by: Steven J. Hill <sjhill@xxxxxxxx> --- arch/mips/cobalt/setup.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index ec3b2c4..3fdd449 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c @@ -15,9 +15,9 @@ #include <linux/ioport.h> #include <linux/pm.h> -#include <asm/bootinfo.h> #include <asm/reboot.h> #include <asm/gt64120.h> +#include <asm/fw/fw.h> #include <cobalt.h> @@ -97,21 +97,9 @@ void __init plat_mem_setup(void) void __init prom_init(void) { - unsigned long memsz; - int argc, i; - char **argv; + fw_init_cmdline(); - memsz = fw_arg0 & 0x7fff0000; - argc = fw_arg0 & 0x0000ffff; - argv = (char **)fw_arg1; - - for (i = 1; i < argc; i++) { - strlcat(arcs_cmdline, argv[i], COMMAND_LINE_SIZE); - if (i < (argc - 1)) - strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); - } - - add_memory_region(0x0, memsz, BOOT_MEM_RAM); + add_memory_region(0x0, (fw_arg0 & 0x7fff0000), BOOT_MEM_RAM); } void __init prom_free_prom_memory(void) -- 1.7.10.3