Commit 026ba130 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: alchemy: Share prom_init implementation 



All boards have the same prom_init() function. Move it to common code and
delete the duplicates.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 396c7d94

arch/mips/alchemy/board-gpr.c

+0 −17
Original line number Diff line number Diff line
@@ -31,23 +31,6 @@ const char *get_system_type(void) 
	return "GPR";

}



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 || kstrtoul(memsize_str, 0, &memsize))

		memsize = 0x04000000;

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

arch/mips/alchemy/board-mtx1.c

+0 −17
Original line number Diff line number Diff line
@@ -30,23 +30,6 @@ const char *get_system_type(void) 
	return "MTX-1";

}



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 || kstrtoul(memsize_str, 0, &memsize))

		memsize = 0x04000000;

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

arch/mips/alchemy/board-xxs1500.c

+0 −18
Original line number Diff line number Diff line
@@ -25,24 +25,6 @@ const char *get_system_type(void) 
	return "XXS1500";

}



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 || kstrtoul(memsize_str, 0, &memsize))

		memsize = 0x04000000;



	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

arch/mips/alchemy/common/prom.c

+20 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/sizes.h>

#include <linux/string.h>



#include <asm/bootinfo.h>
@@ -76,6 +78,24 @@ char *prom_getenv(char *envname) 
	return NULL;

}



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 = SZ_64M; /* minimum memsize is 64MB RAM */



	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



static inline unsigned char str2hexnum(unsigned char c)

{

	if (c >= '0' && c <= '9')

arch/mips/alchemy/devboards/platform.c

+0 −17
Original line number Diff line number Diff line
@@ -20,23 +20,6 @@ 


#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(char c)

{

	if (alchemy_get_cputype() == ALCHEMY_CPU_AU1300)