patch-2.1.73 linux/include/asm-mips/bootinfo.h

• Lines: 76
• Date: Tue Dec 16 12:45:55 1997
• Orig file: v2.1.72/linux/include/asm-mips/bootinfo.h
• Orig date: Thu Jun 26 12:33:39 1997

diff -u --recursive --new-file v2.1.72/linux/include/asm-mips/bootinfo.h linux/include/asm-mips/bootinfo.h
@@ -7,6 +7,8 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive
  * for more details.
+ *
+ * $Id: bootinfo.h,v 1.3 1997/09/19 08:37:44 ralf Exp $
  */
 #ifndef __ASM_MIPS_BOOTINFO_H
 #define __ASM_MIPS_BOOTINFO_H
@@ -14,28 +16,6 @@
 /* XXX */
 #include <linux/config.h>
 
-#if 0
-/*
- * Valid machtype values
- * FIXME: note that we really need a hierarchy for this stuff, as there are 
- * several models of DECStation (for example). PMA
- */
-#define MACH_UNKNOWN		0	/* whatever...                   */
-#define MACH_DESKSTATION_RPC44	1	/* Deskstation rPC44             */
-#define MACH_DESKSTATION_TYNE	2	/* Deskstation Tyne              */
-#define MACH_ACER_PICA_61	3	/* Acer PICA-61 (PICA1)          */
-#define MACH_MIPS_MAGNUM_4000	4	/* Mips Magnum 4000 "RC4030"     */
-#define MACH_OLIVETTI_M700	4	/* almost a clone ...            */
-#define MACH_DECSTATION		5	/* DECStation 5000/2x for now    */
-#define MACH_SNI_RM200_PCI	6	/* RM200/RM300/RM400 PCI series  */
-#define MACH_SGI_INDY		7	/* R4?K and R5K Indy workstaions */
-#define MACH_LAST		7
-
-#define MACH_NAMES {"unknown", "Deskstation rPC44", "Deskstation Tyne", \
-	"Acer PICA 61", "Mips Magnum 4000", "DECStation", "RM200 PCI", \
-        "SGI INDY" }
-#endif
-
 /*
  * Values for machgroup
  */
@@ -47,7 +27,8 @@
 #define MACH_GROUP_ACN		5
 #define MACH_GROUP_SGI          6 /* Silicon Graphics workstations and servers */
 
-#define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", "SNI", "ACN" }
+#define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", \
+                      "SNI", "ACN", "SGI" }
 
 /*
  * Valid machtype values for group unknown (low order halfword of mips_machtype)
@@ -101,6 +82,10 @@
  */
 #define MACH_SGI_INDY		0	/* R4?K and R5K Indy workstaions */
 
+#define GROUP_SGI_NAMES { "Indy" }
+
+#define GROUP_SGI_NAMES { "Indy" }
+
 /*
  * Valid cputype values
  */
@@ -131,13 +116,14 @@
 #define CPU_R5000		24
 #define CPU_R5000A		25
 #define CPU_R4640		26
-#define CPU_LAST                27
+#define CPU_NEVADA		27	/* RM5230, RM5260 */
+#define CPU_LAST		27
 
 #define CPU_NAMES { "unknown", "R2000", "R3000", "R3000A", "R3041", "R3051", \
         "R3052", "R3081", "R3081E", "R4000PC", "R4000SC", "R4000MC",         \
         "R4200", "R4400PC", "R4400SC", "R4400MC", "R4600", "R6000",          \
         "R6000A", "R8000", "R10000", "R4300", "R4650", "R4700", "R5000",     \
-	"R5000A", "R4640" }
+        "R5000A", "R4640", "Nevada" }
 
 #define CL_SIZE      (80)