On 06/05/2012 11:19 PM, Steven J. Hill wrote:
> From: "Steven J. Hill" <sjhill@xxxxxxxx>
>
> Signed-off-by: Steven J. Hill <sjhill@xxxxxxxx>
Acked-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
> ---
> arch/mips/jz4740/prom.c | 25 ++-----------------------
> 1 file changed, 2 insertions(+), 23 deletions(-)
>
> diff --git a/arch/mips/jz4740/prom.c b/arch/mips/jz4740/prom.c
> index 4a70407..c5071ab 100644
> --- a/arch/mips/jz4740/prom.c
> +++ b/arch/mips/jz4740/prom.c
> @@ -20,33 +20,12 @@
>
> #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);
> + fw_init_cmdline();
> mips_machtype = MACH_INGENIC_JZ4740;
> }
>
