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

Commit 23ba25d5 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: devboards: consolidate files 



Share some code and merge small files:
- Extract the prom init code from all devboard files (they only differ in
  memory configuration).
- Merge the irq configuration into board setup code.
- Merge smaller files into board setup code.

Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>

 delete mode 100644 arch/mips/alchemy/devboards/db1x00/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1000/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1000/irqmap.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1100/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1100/irqmap.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1200/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1500/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1500/irqmap.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1550/init.c
 delete mode 100644 arch/mips/alchemy/devboards/pb1550/irqmap.c
 create mode 100644 arch/mips/alchemy/devboards/prom.c
parent 58e75e86

arch/mips/alchemy/devboards/Makefile

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

#



obj-y += prom.o

obj-$(CONFIG_MIPS_PB1000)	+= pb1000/

obj-$(CONFIG_MIPS_PB1100)	+= pb1100/

obj-$(CONFIG_MIPS_PB1200)	+= pb1200/

arch/mips/alchemy/devboards/db1x00/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
# Makefile for the Alchemy Semiconductor DBAu1xx0 boards.

#



lib-y := init.o board_setup.o irqmap.o
 
obj-y := board_setup.o irqmap.o

arch/mips/alchemy/devboards/db1x00/board_setup.c

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,15 @@ 


static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;



const char *get_system_type(void)

{

#ifdef CONFIG_MIPS_BOSPORUS

	return "Alchemy Bosporus Gateway Reference";

#else

	return "Alchemy Db1x00";

#endif

}



void board_reset(void)

{

	/* Hit BCSR.SW_RESET[RESET] */

arch/mips/alchemy/devboards/db1x00/init.c

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

 * BRIEF MODULE DESCRIPTION

 *	PB1000 board setup

 *

 * Copyright 2001, 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 <prom.h>



const char *get_system_type(void)

{

#ifdef CONFIG_MIPS_BOSPORUS

	return "Alchemy Bosporus Gateway Reference";

#else

	return "Alchemy Db1x00";

#endif

}



void __init prom_init(void)

{

	unsigned char *memsize_str;

	unsigned long memsize;



	prom_argc = fw_arg0;

	prom_argv = (char **)fw_arg1;

	prom_envp = (char **)fw_arg2;



	prom_init_cmdline();



	memsize_str = prom_getenv("memsize");

	if (!memsize_str)

		memsize = 0x04000000;

	else

		strict_strtoul(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/alchemy/devboards/pb1000/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
# Makefile for the Alchemy Semiconductor Pb1000 board.

#



lib-y := init.o board_setup.o irqmap.o
 
obj-y := board_setup.o