diff --git a/sys/arch/hpcmips/hpcmips/platid_mask.c b/sys/arch/hpcmips/hpcmips/platid_mask.c
index 836b9ab6fbd6..3c335abf5cff 100644
--- a/sys/arch/hpcmips/hpcmips/platid_mask.c
+++ b/sys/arch/hpcmips/hpcmips/platid_mask.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: platid_mask.c,v 1.1.1.1 1999/09/16 12:23:21 takemura Exp $	*/
+/* $Id: platid_mask.c,v 1.2 1999/09/25 10:52:50 uch Exp $ */
 
 /*-
  * Copyright (c) 1999
@@ -62,6 +62,34 @@ platid_t platid_mask_CPU_MIPS_VR_4121 = {{
 	PLATID_CPU_MIPS_VR_4121,
 	PLATID_WILD
 }};
+platid_t platid_mask_CPU_MIPS_TX = {{
+	PLATID_CPU_MIPS_TX,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_391X = {{
+	PLATID_CPU_MIPS_TX_391X,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_3910 = {{
+	PLATID_CPU_MIPS_TX_3910,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_3911 = {{
+	PLATID_CPU_MIPS_TX_3911,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_3912 = {{
+	PLATID_CPU_MIPS_TX_3912,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_392X = {{
+	PLATID_CPU_MIPS_TX_392X,
+	PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_TX_3922 = {{
+	PLATID_CPU_MIPS_TX_3922,
+	PLATID_WILD
+}};
 platid_t platid_mask_MACH_NEC = {{
 	PLATID_WILD,
 	PLATID_MACH_NEC
@@ -230,3 +258,67 @@ platid_t platid_mask_MACH_FUJITSU_INTERTOP_IT300 = {{
 	PLATID_CPU_MIPS_VR_4121,
 	PLATID_MACH_FUJITSU_INTERTOP_IT300
 }};
+platid_t platid_mask_MACH_PHILIPS = {{
+	PLATID_WILD,
+	PLATID_MACH_PHILIPS
+}};
+platid_t platid_mask_MACH_PHILIPS_NINO = {{
+	PLATID_WILD,
+	PLATID_MACH_PHILIPS_NINO
+}};
+platid_t platid_mask_MACH_PHILIPS_NINO_3XX = {{
+	PLATID_WILD,
+	PLATID_MACH_PHILIPS_NINO_3XX
+}};
+platid_t platid_mask_MACH_PHILIPS_NINO_312 = {{
+	PLATID_CPU_MIPS_TX_3912,
+	PLATID_MACH_PHILIPS_NINO_312
+}};
+platid_t platid_mask_MACH_COMPAQ = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ
+}};
+platid_t platid_mask_MACH_COMPAQ_C = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_C
+}};
+platid_t platid_mask_MACH_COMPAQ_C_8XX = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_C_8XX
+}};
+platid_t platid_mask_MACH_COMPAQ_C_810 = {{
+	PLATID_CPU_MIPS_TX_3912,
+	PLATID_MACH_COMPAQ_C_810
+}};
+platid_t platid_mask_MACH_COMPAQ_C_201X = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_C_201X
+}};
+platid_t platid_mask_MACH_COMPAQ_C_2010 = {{
+	PLATID_CPU_MIPS_TX_3912,
+	PLATID_MACH_COMPAQ_C_2010
+}};
+platid_t platid_mask_MACH_COMPAQ_C_2015 = {{
+	PLATID_CPU_MIPS_TX_3912,
+	PLATID_MACH_COMPAQ_C_2015
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_AERO
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO_21XX = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_AERO_21XX
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO_2110 = {{
+	PLATID_CPU_MIPS_VR_4111,
+	PLATID_MACH_COMPAQ_AERO_2110
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO_2130 = {{
+	PLATID_CPU_MIPS_VR_4111,
+	PLATID_MACH_COMPAQ_AERO_2130
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO_2140 = {{
+	PLATID_CPU_MIPS_VR_4111,
+	PLATID_MACH_COMPAQ_AERO_2140
+}};
diff --git a/sys/arch/hpcmips/include/platid_generated.h b/sys/arch/hpcmips/include/platid_generated.h
index 782ea1a8ff73..5d403d139c3f 100644
--- a/sys/arch/hpcmips/include/platid_generated.h
+++ b/sys/arch/hpcmips/include/platid_generated.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: platid_generated.h,v 1.1.1.1 1999/09/16 12:23:23 takemura Exp $	*/
+/* $Id: platid_generated.h,v 1.2 1999/09/25 10:52:51 uch Exp $ */
 
 /*-
  * Copyright (c) 1999
@@ -60,6 +60,34 @@
 #define PLATID_CPU_MIPS_VR_4121	\
   ((PLATID_CPU_MIPS_VR_4121_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
     PLATID_CPU_MIPS_VR_41XX)
+#define PLATID_CPU_MIPS_TX_NUM	2
+#define PLATID_CPU_MIPS_TX	\
+  ((PLATID_CPU_MIPS_TX_NUM << PLATID_CPU_SERIES_SHIFT)| \
+    PLATID_CPU_MIPS)
+#define PLATID_CPU_MIPS_TX_391X_NUM	1
+#define PLATID_CPU_MIPS_TX_391X	\
+  ((PLATID_CPU_MIPS_TX_391X_NUM << PLATID_CPU_MODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX)
+#define PLATID_CPU_MIPS_TX_3910_NUM	1
+#define PLATID_CPU_MIPS_TX_3910	\
+  ((PLATID_CPU_MIPS_TX_3910_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX_391X)
+#define PLATID_CPU_MIPS_TX_3911_NUM	2
+#define PLATID_CPU_MIPS_TX_3911	\
+  ((PLATID_CPU_MIPS_TX_3911_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX_391X)
+#define PLATID_CPU_MIPS_TX_3912_NUM	3
+#define PLATID_CPU_MIPS_TX_3912	\
+  ((PLATID_CPU_MIPS_TX_3912_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX_391X)
+#define PLATID_CPU_MIPS_TX_392X_NUM	2
+#define PLATID_CPU_MIPS_TX_392X	\
+  ((PLATID_CPU_MIPS_TX_392X_NUM << PLATID_CPU_MODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX)
+#define PLATID_CPU_MIPS_TX_3922_NUM	1
+#define PLATID_CPU_MIPS_TX_3922	\
+  ((PLATID_CPU_MIPS_TX_3922_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_TX_392X)
 #define PLATID_MACH_NEC_NUM	1
 #define PLATID_MACH_NEC	\
   ((PLATID_MACH_NEC_NUM << PLATID_VENDOR_SHIFT))
@@ -223,3 +251,65 @@
 #define PLATID_MACH_FUJITSU_INTERTOP_IT300	\
   ((PLATID_MACH_FUJITSU_INTERTOP_IT300_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_FUJITSU_INTERTOP_ITXXX)
+#define PLATID_MACH_PHILIPS_NUM	6
+#define PLATID_MACH_PHILIPS	\
+  ((PLATID_MACH_PHILIPS_NUM << PLATID_VENDOR_SHIFT))
+#define PLATID_MACH_PHILIPS_NINO_NUM	1
+#define PLATID_MACH_PHILIPS_NINO	\
+  ((PLATID_MACH_PHILIPS_NINO_NUM << PLATID_SERIES_SHIFT)| \
+    PLATID_MACH_PHILIPS)
+#define PLATID_MACH_PHILIPS_NINO_3XX_NUM	1
+#define PLATID_MACH_PHILIPS_NINO_3XX	\
+  ((PLATID_MACH_PHILIPS_NINO_3XX_NUM << PLATID_MODEL_SHIFT)| \
+    PLATID_MACH_PHILIPS_NINO)
+#define PLATID_MACH_PHILIPS_NINO_312_NUM	1
+#define PLATID_MACH_PHILIPS_NINO_312	\
+  ((PLATID_MACH_PHILIPS_NINO_312_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_PHILIPS_NINO_3XX)
+#define PLATID_MACH_COMPAQ_NUM	7
+#define PLATID_MACH_COMPAQ	\
+  ((PLATID_MACH_COMPAQ_NUM << PLATID_VENDOR_SHIFT))
+#define PLATID_MACH_COMPAQ_C_NUM	1
+#define PLATID_MACH_COMPAQ_C	\
+  ((PLATID_MACH_COMPAQ_C_NUM << PLATID_SERIES_SHIFT)| \
+    PLATID_MACH_COMPAQ)
+#define PLATID_MACH_COMPAQ_C_8XX_NUM	1
+#define PLATID_MACH_COMPAQ_C_8XX	\
+  ((PLATID_MACH_COMPAQ_C_8XX_NUM << PLATID_MODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_C)
+#define PLATID_MACH_COMPAQ_C_810_NUM	1
+#define PLATID_MACH_COMPAQ_C_810	\
+  ((PLATID_MACH_COMPAQ_C_810_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_C_8XX)
+#define PLATID_MACH_COMPAQ_C_201X_NUM	2
+#define PLATID_MACH_COMPAQ_C_201X	\
+  ((PLATID_MACH_COMPAQ_C_201X_NUM << PLATID_MODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_C)
+#define PLATID_MACH_COMPAQ_C_2010_NUM	1
+#define PLATID_MACH_COMPAQ_C_2010	\
+  ((PLATID_MACH_COMPAQ_C_2010_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_C_201X)
+#define PLATID_MACH_COMPAQ_C_2015_NUM	2
+#define PLATID_MACH_COMPAQ_C_2015	\
+  ((PLATID_MACH_COMPAQ_C_2015_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_C_201X)
+#define PLATID_MACH_COMPAQ_AERO_NUM	2
+#define PLATID_MACH_COMPAQ_AERO	\
+  ((PLATID_MACH_COMPAQ_AERO_NUM << PLATID_SERIES_SHIFT)| \
+    PLATID_MACH_COMPAQ)
+#define PLATID_MACH_COMPAQ_AERO_21XX_NUM	1
+#define PLATID_MACH_COMPAQ_AERO_21XX	\
+  ((PLATID_MACH_COMPAQ_AERO_21XX_NUM << PLATID_MODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_AERO)
+#define PLATID_MACH_COMPAQ_AERO_2110_NUM	1
+#define PLATID_MACH_COMPAQ_AERO_2110	\
+  ((PLATID_MACH_COMPAQ_AERO_2110_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_AERO_21XX)
+#define PLATID_MACH_COMPAQ_AERO_2130_NUM	2
+#define PLATID_MACH_COMPAQ_AERO_2130	\
+  ((PLATID_MACH_COMPAQ_AERO_2130_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_AERO_21XX)
+#define PLATID_MACH_COMPAQ_AERO_2140_NUM	3
+#define PLATID_MACH_COMPAQ_AERO_2140	\
+  ((PLATID_MACH_COMPAQ_AERO_2140_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_AERO_21XX)
diff --git a/sys/arch/hpcmips/include/platid_mask.h b/sys/arch/hpcmips/include/platid_mask.h
index aa0f3541d49e..a67a4e445b90 100644
--- a/sys/arch/hpcmips/include/platid_mask.h
+++ b/sys/arch/hpcmips/include/platid_mask.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: platid_mask.h,v 1.1.1.1 1999/09/16 12:23:23 takemura Exp $	*/
+/* $Id: platid_mask.h,v 1.2 1999/09/25 10:52:51 uch Exp $ */
 
 /*-
  * Copyright (c) 1999
@@ -61,6 +61,34 @@ extern platid_t platid_mask_CPU_MIPS_VR_4121;
 #ifdef PLATID_DEFINE_MASK_NICKNAME
 #  define GENERIC_MIPS_VR_4121 ((int)&platid_mask_CPU_MIPS_VR_4121)
 #endif
+extern platid_t platid_mask_CPU_MIPS_TX;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX ((int)&platid_mask_CPU_MIPS_TX)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_391X;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_391X ((int)&platid_mask_CPU_MIPS_TX_391X)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_3910;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_3910 ((int)&platid_mask_CPU_MIPS_TX_3910)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_3911;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_3911 ((int)&platid_mask_CPU_MIPS_TX_3911)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_3912;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_3912 ((int)&platid_mask_CPU_MIPS_TX_3912)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_392X;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_392X ((int)&platid_mask_CPU_MIPS_TX_392X)
+#endif
+extern platid_t platid_mask_CPU_MIPS_TX_3922;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define GENERIC_MIPS_TX_3922 ((int)&platid_mask_CPU_MIPS_TX_3922)
+#endif
 extern platid_t platid_mask_MACH_NEC;
 #ifdef PLATID_DEFINE_MASK_NICKNAME
 #  define NEC ((int)&platid_mask_MACH_NEC)
@@ -229,3 +257,67 @@ extern platid_t platid_mask_MACH_FUJITSU_INTERTOP_IT300;
 #ifdef PLATID_DEFINE_MASK_NICKNAME
 #  define FUJITSU_INTERTOP_IT300 ((int)&platid_mask_MACH_FUJITSU_INTERTOP_IT300)
 #endif
+extern platid_t platid_mask_MACH_PHILIPS;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define PHILIPS ((int)&platid_mask_MACH_PHILIPS)
+#endif
+extern platid_t platid_mask_MACH_PHILIPS_NINO;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define PHILIPS_NINO ((int)&platid_mask_MACH_PHILIPS_NINO)
+#endif
+extern platid_t platid_mask_MACH_PHILIPS_NINO_3XX;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define PHILIPS_NINO_3XX ((int)&platid_mask_MACH_PHILIPS_NINO_3XX)
+#endif
+extern platid_t platid_mask_MACH_PHILIPS_NINO_312;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define PHILIPS_NINO_312 ((int)&platid_mask_MACH_PHILIPS_NINO_312)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ ((int)&platid_mask_MACH_COMPAQ)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C ((int)&platid_mask_MACH_COMPAQ_C)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C_8XX;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C_8XX ((int)&platid_mask_MACH_COMPAQ_C_8XX)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C_810;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C_810 ((int)&platid_mask_MACH_COMPAQ_C_810)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C_201X;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C_201X ((int)&platid_mask_MACH_COMPAQ_C_201X)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C_2010;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C_2010 ((int)&platid_mask_MACH_COMPAQ_C_2010)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_C_2015;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_C_2015 ((int)&platid_mask_MACH_COMPAQ_C_2015)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO ((int)&platid_mask_MACH_COMPAQ_AERO)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO_21XX;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO_21XX ((int)&platid_mask_MACH_COMPAQ_AERO_21XX)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO_2110;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO_2110 ((int)&platid_mask_MACH_COMPAQ_AERO_2110)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO_2130;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO_2130 ((int)&platid_mask_MACH_COMPAQ_AERO_2130)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO_2140;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO_2140 ((int)&platid_mask_MACH_COMPAQ_AERO_2140)
+#endif