Unverified Commit 75cac781 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Paul Burton
Browse files

MIPS: Loongson{2ef, 32, 64} convert to generic fw cmdline 



All of Loongson firmwares are passing boot cmdline/env
in the manner of YAMON/PMON. Thus we can remove duplicated
cmdline initialize code and convert to generic fw method.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: chenhe@lemote.com
parent 28e6b875

arch/mips/include/asm/mach-loongson2ef/loongson.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ extern const struct plat_smp_ops loongson3_smp_ops; 


/* loongson-specific command line, env and memory initialization */

extern void __init prom_init_memory(void);

extern void __init prom_init_cmdline(void);

extern void __init prom_init_machtype(void);

extern void __init prom_init_env(void);

#ifdef CONFIG_LOONGSON_UART_BASE

arch/mips/include/asm/mach-loongson32/prom.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright (c) 2011 Zhang, Keguang <keguang.zhang@gmail.com>

 */



#ifndef __ASM_MACH_LOONGSON32_PROM_H

#define __ASM_MACH_LOONGSON32_PROM_H



#include <linux/io.h>

#include <linux/init.h>

#include <linux/irq.h>



/* environment arguments from bootloader */

extern unsigned long memsize, highmemsize;



/* loongson-specific command line, env and memory initialization */

extern char *prom_getenv(char *name);

extern void __init prom_init_cmdline(void);



#endif /* __ASM_MACH_LOONGSON32_PROM_H */

arch/mips/include/asm/mach-loongson64/loongson.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ extern const struct plat_smp_ops loongson3_smp_ops; 


/* loongson-specific command line, env and memory initialization */

extern void __init prom_init_memory(void);

extern void __init prom_init_cmdline(void);

extern void __init prom_init_env(void);



/* irq operation functions */

arch/mips/loongson2ef/common/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Makefile for loongson based machines.

#



obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \

obj-y += setup.o init.o env.o time.o reset.o irq.o \

    bonito-irq.o mem.o machtype.o platform.o serial.o

obj-$(CONFIG_PCI) += pci.o

arch/mips/loongson2ef/common/cmdline.c

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Based on Ocelot Linux port, which is

 * Copyright 2001 MontaVista Software Inc.

 * Author: jsun@mvista.com or jsun@junsun.net

 *

 * Copyright 2003 ICT CAS

 * Author: Michael Guo <guoyi@ict.ac.cn>

 *

 * Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology

 * Author: Fuxin Zhang, zhangfx@lemote.com

 *

 * Copyright (C) 2009 Lemote Inc.

 * Author: Wu Zhangjin, wuzhangjin@gmail.com

 */

#include <asm/bootinfo.h>



#include <loongson.h>



void __init prom_init_cmdline(void)

{

	int prom_argc;

	/* pmon passes arguments in 32bit pointers */

	int *_prom_argv;

	int i;

	long l;



	/* firmware arguments are initialized in head.S */

	prom_argc = fw_arg0;

	_prom_argv = (int *)fw_arg1;



	/* arg[0] is "g", the rest is boot parameters */

	arcs_cmdline[0] = '\0';

	for (i = 1; i < prom_argc; i++) {

		l = (long)_prom_argv[i];

		if (strlen(arcs_cmdline) + strlen(((char *)l) + 1)

		    >= sizeof(arcs_cmdline))

			break;

		strcat(arcs_cmdline, ((char *)l));

		strcat(arcs_cmdline, " ");

	}



	prom_init_machtype();

}