--- zzzz-none-000/linux-2.4.17/include/asm-mips/bootinfo.h	2001-09-09 17:43:01.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-mips/bootinfo.h	2004-11-24 13:21:33.000000000 +0000
@@ -27,14 +27,19 @@
 #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 Referrence Board           */
+#define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Reference 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)      */
+#define MACH_GROUP_LEXRA       22 /* Lexra Development Board */
+#define MACH_GROUP_IDT         23 /* IDT Eval Boards                          */
 #define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", "SNI", "ACN",      \
 	"SGI", "Cobalt", "NEC DDB", "Baget", "Cosine", "Galileo", "Momentum", \
-	"ITE", "Philips", "Globepspan", "SiByte", "Toshiba", "Alchemy" }
+	"ITE", "Philips", "Globepspan", "SiByte", "Toshiba", "Alchemy",       \
+	"NEC Vr41xx", "HP LaserJet", "Emotion Engine", "Lexra", "IDT" }
 
 /*
  * Valid machtype values for group unknown (low order halfword of mips_machtype)
@@ -115,8 +120,9 @@
 #define MACH_NEC_DDB5074	 0	/* NEC DDB Vrc-5074 */
 #define MACH_NEC_DDB5476         1      /* NEC DDB Vrc-5476 */
 #define MACH_NEC_DDB5477         2      /* NEC DDB Vrc-5477 */
+#define MACH_NEC_ROCKHOPPER      3      /* rockhopper base board */
 
-#define GROUP_NEC_DDB_NAMES { "Vrc-5074", "Vrc-5476", "Vrc-5477"}
+#define GROUP_NEC_DDB_NAMES { "Vrc-5074", "Vrc-5476", "Vrc-5477", "Rockhopper" }
 
 /*
  * Valid machtype for group BAGET
@@ -184,15 +190,51 @@
 #define MACH_PALLAS		0
 #define MACH_TOPAS		1
 #define MACH_JMR		2
+#define MACH_TOSHIBA_JMR3927    3      /* JMR-TX3927 CPU/IO board */
 
-#define GROUP_TOSHIBA_NAMES { "Pallas", "TopasCE", "JMR" }
+#define GROUP_TOSHIBA_NAMES { "Pallas", "TopasCE", "JMR", "JMR TX3927" }
 
 /*
  * Valid machtype for group Alchemy
  */
 #define MACH_PB1000	0	         /* Au1000-based eval board */
  
-#define GROUP_ALCHEMY_NAMES { "PB1000" } /* the actual board name */
+#define GROUP_ALCHEMY_NAMES { "Pb1000" } /* the actual board name */
+
+/*
+ * 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 GROUP_NEC_VR41XX_NAMES { "Osprey", "Eagle", "Korva", "Clio 1000", \
+                "MobilePro 780" }
+
+/*
+ * Valid machtype for group EE
+ */
+#define MACH_T10000    0       /* DTL-10000 */
+#define MACH_PS2       1       /* PlayStation 2 */
+
+#define GROUP_EE_NAMES { "T10000", "PS2" }
+
+/*
+ * Valid machtype for group IDT
+ */
+#define MACH_IDT79S334   0
+#define MACH_IDT79EB355  1
+
+#define GROUP_IDT_NAMES { "79S334", "79EB355" }
+
+/*
+ * Valid machtype for group LEXRA
+ */
+#define MACH_LXPB20K 		 0	/* LXPB20K */
+
+#define GROUP_LEXRA_NAMES { "LXPB20K" }
 
 /*
  * Valid cputype values
@@ -238,8 +280,13 @@
 #define CPU_4KEC		38
 #define CPU_4KSC		39
 #define CPU_VR41XX		40
-#define CPU_LAST		40
-
+#define CPU_R5500		41
+#define CPU_TX49XX		42
+#define CPU_TX39XX		43
+#define CPU_R5900		44
+#define CPU_AU1500		45	
+#define CPU_RC32300             46
+#define CPU_LAST		46
 
 #define CPU_NAMES { "unknown", "R2000", "R3000", "R3000A", "R3041", "R3051", \
         "R3052", "R3081", "R3081E", "R4000PC", "R4000SC", "R4000MC",         \
@@ -247,7 +294,8 @@
         "R6000A", "R8000", "R10000", "R4300", "R4650", "R4700", "R5000",     \
         "R5000A", "R4640", "Nevada", "RM7000", "R5432", "MIPS 4Kc",          \
         "MIPS 5Kc", "R4310", "SiByte SB1", "TX3912", "TX3922", "TX3927",     \
-	"Au1000", "MIPS 4KEc", "MIPS 4KSc", "NEC Vr41xx" }
+	"Au1000", "MIPS 4KEc", "MIPS 4KSc", "NEC Vr41xx", "R5500", "TX49xx", \
+	"TX39xx", "R5900", "Au1500", "RC32300" }
 
 #define COMMAND_LINE_SIZE	256
 
@@ -257,6 +305,7 @@
 #define BOOT_MEM_RESERVED	3
 
 #ifndef __ASSEMBLY__
+#ifndef _LANGUAGE_ASSEMBLY
 
 /*
  * Some machine parameters passed by the bootloaders. 
@@ -284,10 +333,8 @@
  * values in setup.c (or whereever suitable) so they are in
  * .data section
  */
-extern struct mips_cpu mips_cpu;
 extern unsigned long mips_machtype;
 extern unsigned long mips_machgroup;
-extern unsigned long mips_tlb_entries;
 
 /*
  * A memory map that's built upon what was determined
@@ -307,6 +354,7 @@
 extern void add_memory_region(unsigned long start, unsigned long size,
 			      long type);
 
+#endif /* !_LANGUAGE_ASSEMBLY */
 #endif /* !__ASSEMBLY__ */
 
 #endif /* _ASM_BOOTINFO_H */