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

Commit 25b31cb1 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Jeff Garzik
Browse files

add new prom.h for AU1x00 



Add new prom.h for AU1x00.

Signed-off-by: default avatarYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2de88923

arch/mips/au1000/common/prom.c

+10 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
 *  with this program; if not, write  to the Free Software Foundation, Inc.,

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

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -41,11 +40,9 @@ 


#include <asm/bootinfo.h>



/* #define DEBUG_CMDLINE */



extern int prom_argc;

extern char **prom_argv, **prom_envp;



int prom_argc;

char **prom_argv;

char **prom_envp;



char * __init_or_module prom_getcmdline(void)

{
@@ -70,10 +67,8 @@ void prom_init_cmdline(void) 
		--cp;

	if (prom_argc > 1)

		*cp = '\0';



}





char *prom_getenv(char *envname)

{

	/*
@@ -95,6 +90,7 @@ char *prom_getenv(char *envname) 
		}

		env++;

	}



	return NULL;

}
@@ -106,6 +102,7 @@ static inline unsigned char str2hexnum(unsigned char c) 
		return c - 'a' + 10;

	if (c >= 'A' && c <= 'F')

		return c - 'A' + 10;



	return 0; /* foo */

}

arch/mips/au1000/common/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -40,10 +40,11 @@ 
#include <asm/mipsregs.h>

#include <asm/reboot.h>

#include <asm/pgtable.h>

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

#include <asm/time.h>



extern char * prom_getcmdline(void);

#include <au1000.h>

#include <prom.h>



extern void __init board_setup(void);

extern void au1000_restart(char *);

extern void au1000_halt(void);

arch/mips/au1000/db1x00/init.c

+4 −6
Original line number Diff line number Diff line
@@ -31,15 +31,13 @@ 
#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/bootmem.h>

#include <asm/addrspace.h>

#include <asm/bootinfo.h>

#include <linux/string.h>

#include <linux/kernel.h>



int prom_argc;

char **prom_argv, **prom_envp;

extern void  __init prom_init_cmdline(void);

extern char *prom_getenv(char *envname);

#include <asm/addrspace.h>

#include <asm/bootinfo.h>



#include <prom.h>



const char *get_system_type(void)

{

arch/mips/au1000/mtx-1/init.c

+2 −4
Original line number Diff line number Diff line
@@ -34,13 +34,11 @@ 
#include <linux/init.h>

#include <linux/mm.h>

#include <linux/bootmem.h>



#include <asm/addrspace.h>

#include <asm/bootinfo.h>



int prom_argc;

char **prom_argv, **prom_envp;

extern void  __init prom_init_cmdline(void);

extern char *prom_getenv(char *envname);

#include <prom.h>



const char *get_system_type(void)

{

arch/mips/au1000/pb1000/init.c

+4 −6
Original line number Diff line number Diff line
@@ -30,15 +30,13 @@ 
#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/bootmem.h>

#include <asm/addrspace.h>

#include <asm/bootinfo.h>

#include <linux/string.h>

#include <linux/kernel.h>



int prom_argc;

char **prom_argv, **prom_envp;

extern void  __init prom_init_cmdline(void);

extern char *prom_getenv(char *envname);

#include <asm/addrspace.h>

#include <asm/bootinfo.h>



#include <prom.h>



const char *get_system_type(void)

{