[Linux-mips-commits]CVS: linux/include/asm-mips64 bootinfo.h,1.8,1.9

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv6700

Modified Files:
	bootinfo.h 
Log Message:
Update from 32-bit kernel.

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/bootinfo.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bootinfo.h	4 Jan 2002 18:04:53 -0000	1.8
+++ bootinfo.h	12 Feb 2002 18:15:32 -0000	1.9
@@ -9,6 +9,8 @@
 #ifndef _ASM_BOOTINFO_H
 #define _ASM_BOOTINFO_H
 
+#include <linux/types.h>
+
 /*
  * Values for machgroup
  */
@@ -27,13 +29,12 @@
 #define MACH_GROUP_MOMENCO     12 /* Momentum Boards                          */
 #define MACH_GROUP_ITE         13 /* ITE Semi Eval Boards                     */
 #define MACH_GROUP_PHILIPS     14
-#define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Reference Board            */
+#define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Referrence Board           */
 #define MACH_GROUP_SIBYTE      16 /* Sibyte Eval Boards                       */
 #define MACH_GROUP_TOSHIBA     17 /* Toshiba Reference Systems TSBREF         */
 #define MACH_GROUP_ALCHEMY     18 /* Alchemy Semi Eval Boards*/
 #define MACH_GROUP_NEC_VR41XX  19 /* NEC Vr41xx based boards/gadgets          */
 #define MACH_GROUP_HP_LJ	20 /* Hewlett Packard LaserJet */
-#define MACH_GROUP_EE          21 /* Emotion Engine (Sony PlayStation 2)      */
 
 /*
  * Valid machtype values for group unknown (low order halfword of mips_machtype)
@@ -159,18 +160,7 @@
 /*
  * Valid machtype for group NEC_VR41XX
  */
-#define MACH_NEC_OSPREY			0	/* Osprey eval board */
-#define MACH_NEC_EAGLE			1	/* NEC Eagle board */
-#define MACH_NEC_KORVA			2	/* NEC korva board */
-#define MACH_VADEM_CLIO_1000		3	/* Vadem Clio 1000 */
-#define MACH_NEC_MOBILEPRO_780		4	/* NEC MobilePro 780 PDA */
-#define MACH_CASIO_E15			5	/* Casio Cassiopeia E15 */
-
-/*
- * Valid machtype for group EE
- */
-#define MACH_T10000			0	/* DTL-10000 */
-#define MACH_PS2			1	/* PlayStation 2 */
+#define MACH_NEC_OSPREY                0       /* Osprey eval board */
 
 #define CL_SIZE			80
 
@@ -191,15 +181,14 @@
 struct boot_mem_map {
 	int nr_map;
 	struct {
-		unsigned long addr;	/* start of memory segment */
-		unsigned long size;	/* size of memory segment */
+		phys_t addr;	/* start of memory segment */
+		phys_t size;	/* size of memory segment */
 		long type;		/* type of memory segment */
 	} map[BOOT_MEM_MAP_MAX];
 };
 
 extern struct boot_mem_map boot_mem_map;
 
-extern void add_memory_region(unsigned long start, unsigned long size,
-                              long type);
+extern void add_memory_region(phys_t start, phys_t size, long type);
 
 #endif /* _ASM_BOOTINFO_H */