Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e08a48d9 authored by Paul Burton's avatar Paul Burton Committed by James Hogan
Browse files

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: default avatarPaul Burton <paul.burton@mips.com>
Reviewed-by: default avatarPrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Reviewed-by: default avatarJames 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: default avatarJames Hogan <jhogan@kernel.org>
parent 8ce355cf

arch/mips/jz4740/prom.c

+2 −22
Original line number Original line Diff line number Diff line
@@ -20,33 +20,13 @@ 
#include <linux/serial_reg.h>

#include <linux/serial_reg.h>





#include <asm/bootinfo.h>

#include <asm/bootinfo.h>

#include <asm/fw/fw.h>

#include <asm/mach-jz4740/base.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)

void __init prom_init(void)

{

{

	jz4740_init_cmdline((int)fw_arg0, (char **)fw_arg1);

	mips_machtype = MACH_INGENIC_JZ4740;

	mips_machtype = MACH_INGENIC_JZ4740;

	fw_init_cmdline();

}

}





void __init prom_free_prom_memory(void)

void __init prom_free_prom_memory(void)