fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-mips / bootinfo.h

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index c9c257c..8e321f5 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -77,6 +77,7 @@
 #define  MACH_SGI_IP27         1       /* Origin 200, Origin 2000, Onyx 2 */
 #define  MACH_SGI_IP28         2       /* Indigo2 Impact               */
 #define  MACH_SGI_IP32         3       /* O2                           */
+#define  MACH_SGI_IP30         4       /* Octane, Octane2              */
 
 /*
  * Valid machtype for group COBALT
@@ -111,8 +112,7 @@
  * Valid machtype for group GALILEO
  */
 #define MACH_GROUP_GALILEO     11      /* Galileo Eval Boards          */
-#define  MACH_EV96100          0       /* EV96100 */
-#define  MACH_EV64120A         1       /* EV64120A */
+#define  MACH_EV64120A         0       /* EV64120A */
 
 /*
  * Valid machtype for group MOMENCO
@@ -122,12 +122,7 @@
 #define  MACH_MOMENCO_OCELOT_G 1
 #define  MACH_MOMENCO_OCELOT_C 2
 #define  MACH_MOMENCO_JAGUAR_ATX 3
-
-/*
- * Valid machtype for group ITE
- */
-#define MACH_GROUP_ITE         13      /* ITE Semi Eval Boards         */
-#define  MACH_QED_4N_S01B      0       /* ITE8172 based eval board */
+#define  MACH_MOMENCO_OCELOT_3 4
 
 /*
  * Valid machtype for group PHILIPS
@@ -135,12 +130,8 @@
 #define MACH_GROUP_PHILIPS     14
 #define  MACH_PHILIPS_NINO     0       /* Nino */
 #define  MACH_PHILIPS_VELO     1       /* Velo */
-
-/*
- * Valid machtype for group Globespan
- */
-#define MACH_GROUP_GLOBESPAN   15      /* Globespan */
-#define  MACH_IVR              0       /* IVR eval board */
+#define  MACH_PHILIPS_JBS      2       /* JBS */
+#define  MACH_PHILIPS_STB810   3       /* STB810 */
 
 /*
  * Valid machtype for group SIBYTE
@@ -158,6 +149,7 @@
 #define  MACH_TOSHIBA_JMR3927  3       /* JMR-TX3927 CPU/IO board */
 #define  MACH_TOSHIBA_RBTX4927 4
 #define  MACH_TOSHIBA_RBTX4937 5
+#define  MACH_TOSHIBA_RBTX4938 6
 
 #define GROUP_TOSHIBA_NAMES    { "Pallas", "TopasCE", "JMR", "JMR TX3927", \
                                  "RBTX4927", "RBTX4937" }
@@ -175,6 +167,9 @@
 #define  MACH_XXS1500          6       /* Au1500-based eval board */
 #define  MACH_MTX1             7       /* 4G MTX-1 Au1500-based board */
 #define  MACH_PB1550           8       /* Au1550-based eval board */
+#define  MACH_DB1550           9       /* Au1550-based eval board */
+#define  MACH_PB1200           10       /* Au1200-based eval board */
+#define  MACH_DB1200           11       /* Au1200-based eval board */
 
 /*
  * Valid machtype for group NEC_VR41XX
@@ -193,6 +188,7 @@
 #define  MACH_CASIO_E55                5       /* CASIO CASSIOPEIA E-10/15/55/65 */
 #define  MACH_TANBAC_TB0226    6       /* TANBAC TB0226 (Mbase) */
 #define  MACH_TANBAC_TB0229    7       /* TANBAC TB0229 (VR4131DIMM) */
+#define  MACH_NEC_CMBVR4133    8       /* CMB VR4133 Board */
 
 #define MACH_GROUP_HP_LJ       20      /* Hewlett Packard LaserJet     */
 #define  MACH_HP_LASERJET      1
@@ -209,6 +205,13 @@
  */
 #define MACH_GROUP_TITAN       22      /* PMC-Sierra Titan             */
 #define  MACH_TITAN_YOSEMITE   1       /* PMC-Sierra Yosemite          */
+#define  MACH_TITAN_EXCITE     2       /* Basler eXcite                */
+
+/*
+ * Valid machtype for group NEC EMMA2RH
+ */
+#define MACH_GROUP_NEC_EMMA2RH 25      /* NEC EMMA2RH (was 23)         */
+#define  MACH_NEC_MARKEINS     0       /* NEC EMMA2RH Mark-eins        */
 
 #define CL_SIZE                        COMMAND_LINE_SIZE
 
@@ -250,4 +253,10 @@ extern char arcs_cmdline[CL_SIZE];
  * Registers a0, a1, a3 and a4 as passed to the kenrel entry by firmware
  */
 extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;
+
+/*
+ * Platform memory detection hook called by setup_arch
+ */
+extern void plat_mem_setup(void);
+
 #endif /* _ASM_BOOTINFO_H */