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

Commit 278bf05c authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: devboards: kill prom.c 



move contents to already existing platform.c file.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3287/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3e25f4f2

arch/mips/alchemy/devboards/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Alchemy Develboards

# Alchemy Develboards

#

#





obj-y += prom.o bcsr.o platform.o

obj-y += bcsr.o platform.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_MIPS_PB1100)	+= pb1100.o

obj-$(CONFIG_MIPS_PB1100)	+= pb1100.o

obj-$(CONFIG_MIPS_PB1500)	+= pb1500.o

obj-$(CONFIG_MIPS_PB1500)	+= pb1500.o

arch/mips/alchemy/devboards/platform.c

+30 −0
Original line number Original line Diff line number Diff line
@@ -10,9 +10,39 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/pm.h>





#include <asm/bootinfo.h>

#include <asm/reboot.h>

#include <asm/reboot.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-db1x00/bcsr.h>

#include <asm/mach-db1x00/bcsr.h>





#include <prom.h>



void __init prom_init(void)

{

	unsigned char *memsize_str;

	unsigned long memsize;



	prom_argc = (int)fw_arg0;

	prom_argv = (char **)fw_arg1;

	prom_envp = (char **)fw_arg2;



	prom_init_cmdline();

	memsize_str = prom_getenv("memsize");

	if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))

		memsize = 64 << 20; /* all devboards have at least 64MB RAM */



	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

{

#ifdef CONFIG_MIPS_DB1300

	alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);

#else

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

#endif

}







static struct platform_device db1x00_rtc_dev = {

static struct platform_device db1x00_rtc_dev = {

	.name	= "rtc-au1xxx",

	.name	= "rtc-au1xxx",

arch/mips/alchemy/devboards/prom.c

deleted100644 → 0
+0 −60
Original line number Original line Diff line number Diff line 
/*

 * Common code used by all Alchemy develboards.

 *

 * Extracted from files which had this to say:

 *

 * Copyright 2000, 2008 MontaVista Software Inc.

 * Author: MontaVista Software, Inc. <source@mvista.com>

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED

 *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF

 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

 *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,

 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF

 *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT

 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *  You should have received a copy of the  GNU General Public License along

 *  with this program; if not, write  to the Free Software Foundation, Inc.,

 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <asm/bootinfo.h>

#include <asm/mach-au1x00/au1000.h>

#include <prom.h>



void __init prom_init(void)

{

	unsigned char *memsize_str;

	unsigned long memsize;



	prom_argc = (int)fw_arg0;

	prom_argv = (char **)fw_arg1;

	prom_envp = (char **)fw_arg2;



	prom_init_cmdline();

	memsize_str = prom_getenv("memsize");

	if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))

		memsize = 64 << 20; /* all devboards have at least 64MB RAM */



	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

{

#ifdef CONFIG_MIPS_DB1300

	alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);

#else

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

#endif

}