From b5cc8361e0c5ce2b972872699aa729216f1bb2ea Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Thu, 6 Nov 1997 19:42:46 +0000
Subject: Idnetify/support hp385 (33Mhz 68040)

---
 sys/arch/hp300/DOC/Options             | 5 +++--
 sys/arch/hp300/conf/GENERIC            | 3 ++-
 sys/arch/hp300/conf/files.hp300        | 3 ++-
 sys/arch/hp300/hp300/genassym.cf       | 4 +++-
 sys/arch/hp300/hp300/locore.s          | 9 +++++++--
 sys/arch/hp300/hp300/machdep.c         | 6 +++++-
 sys/arch/hp300/hp300/pmap.c            | 4 ++--
 sys/arch/hp300/include/hp300spu.h      | 7 +++++--
 sys/arch/hp300/stand/common/autoconf.c | 3 ++-
 sys/arch/hp300/stand/common/machdep.c  | 4 +++-
 sys/arch/hp300/stand/uboot/srt0.S      | 9 +++++++--
 11 files changed, 41 insertions(+), 16 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/hp300/DOC/Options b/sys/arch/hp300/DOC/Options
index 62850963aef..05ae33ab351 100644
--- a/sys/arch/hp300/DOC/Options
+++ b/sys/arch/hp300/DOC/Options
@@ -1,4 +1,4 @@
-$OpenBSD: Options,v 1.5 1997/09/23 07:09:52 downsj Exp $
+$OpenBSD: Options,v 1.6 1997/11/06 19:42:26 millert Exp $
 $NetBSD: Options,v 1.7 1997/09/12 08:04:12 mycroft Exp $
 
 Here is a list of hp300 specific kernel compilation options and what they
@@ -37,7 +37,8 @@ HP370
 	place, in dealing with flushing the external cache.
 
 HP380
-	Support for "current" hp380/425 (and 433) machines: 25 (33) mhz 68040
+HP385
+	Support for "current" hp380/425/385/433 machines: 25 (33) mhz 68040
 	with MMU/FPU.  Compiles in support for 68040.
 
 FPSP
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 00472befa90..841ef79c424 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.21 1997/07/06 08:01:42 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.22 1997/11/06 19:42:30 millert Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -19,6 +19,7 @@ option	 	HP360
 option	 	HP370
 option	 	HP375
 option	 	HP380
+option	 	HP385
 option	 	HP400
 option	 	HP425
 option	 	HP433
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index 1f6fe815e06..a2598ad276e 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hp300,v 1.10 1997/07/06 08:01:43 downsj Exp $
+#	$OpenBSD: files.hp300,v 1.11 1997/11/06 19:42:31 millert Exp $
 #	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
@@ -18,6 +18,7 @@ defopt	HP360
 defopt	HP370
 defopt	HP375
 defopt	HP380
+defopt	HP385
 defopt	HP400
 defopt	HP425
 defopt	HP433
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index 688ad58a771..cc2731611fb 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.4 1997/07/06 08:01:59 downsj Exp $
+#	$OpenBSD: genassym.cf,v 1.5 1997/11/06 19:42:33 millert Exp $
 #	$NetBSD: genassym.cf,v 1.8 1997/05/13 18:01:01 gwr Exp $
 
 #
@@ -100,6 +100,7 @@ define	HP_360			HP_360
 define	HP_370			HP_370
 define	HP_375			HP_375
 define	HP_380			HP_380
+define	HP_385			HP_385
 define	HP_400			HP_400
 define	HP_425			HP_425
 define	HP_433			HP_433
@@ -107,6 +108,7 @@ define	HP_433			HP_433
 # values for mmuid
 define	MMUID_345		MMUID_345
 define	MMUID_375		MMUID_375
+define	MMUID_385		MMUID_385
 define	MMUID_425_T		MMUID_425_T
 define	MMUID_425_S		MMUID_425_S
 define	MMUID_433_T		MMUID_433_T
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index c884e4e0920..9c9eb9a778a 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.19 1997/09/23 07:09:54 downsj Exp $	*/
+/*	$OpenBSD: locore.s,v 1.20 1997/11/06 19:42:34 millert Exp $	*/
 /*	$NetBSD: locore.s,v 1.79 1997/09/12 08:41:55 mycroft Exp $	*/
 
 /*
@@ -270,8 +270,10 @@ Lnot68030:
 	jeq	Lisa425
 	cmpb	#MMUID_433_T,d0		| or a 433t?
 	jeq	Lisa433
-	cmpb	#MMUID_433_S,d0		| last chance...
+	cmpb	#MMUID_433_S,d0		| maybe a 433s?
 	jeq	Lisa433
+	cmpb	#MMUID_385,d0		| last chance...
+	jeq	Lisa385
 	movl	#HP_380,a0@		| guess we're a 380
 	jra	Lstart1
 Lisa425:
@@ -280,6 +282,9 @@ Lisa425:
 Lisa433:
 	movl	#HP_433,a0@
 	jra	Lstart1
+Lisa385:
+	movl	#HP_385,a0@
+	jra	Lstart1
 
 	/*
 	 * End of 68040 section
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 8d8417c357f..9d049a4f12e 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.27 1997/07/06 08:02:05 downsj Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.28 1997/11/06 19:42:37 millert Exp $	*/
 /*	$NetBSD: machdep.c,v 1.94 1997/06/12 15:46:29 mrg Exp $	*/
 
 /*
@@ -498,6 +498,7 @@ struct hp300_model hp300_models[] = {
 	{ HP_370,	"370",		"        ", "33.33"	},
 	{ HP_375,	"375",		"	 ", "50"	},
 	{ HP_380,	"380",		"        ", "25"	},
+	{ HP_385,	"385",		"        ", "33"	},
 	{ HP_400,	"400",		"        ", "50"	},
 	{ HP_425,	"425",		"     t s", "25"	},
 	{ HP_433,	"433",		"    t s ", "33"	},
@@ -654,6 +655,9 @@ identifycpu()
 #if !defined(HP380)
 	case HP_380:
 #endif
+#if !defined(HP385)
+	case HP_385:
+#endif
 #if !defined(HP400)
 	case HP_400:
 #endif
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index 42bc7c1b9f6..fe6a0dcf7f0 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.8 1997/07/06 08:02:07 downsj Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.9 1997/11/06 19:42:38 millert Exp $	*/
 /*	$NetBSD: pmap.c,v 1.36 1997/06/10 18:52:23 veego Exp $	*/
 
 /* 
@@ -47,7 +47,7 @@
  *	68020 with HP MMU	models 320, 350
  *	68020 with 68551 MMU	models 318, 319, 330
  *	68030 with on-chip MMU	models 340, 360, 370, 345, 375, 400
- *	68040 with on-chip MMU	models 380, 425, 433
+ *	68040 with on-chip MMU	models 380, 385, 425, 433
  *
  * Notes:
  *	Don't even pay lip service to multiprocessor support.
diff --git a/sys/arch/hp300/include/hp300spu.h b/sys/arch/hp300/include/hp300spu.h
index 7e840442f58..9b913255796 100644
--- a/sys/arch/hp300/include/hp300spu.h
+++ b/sys/arch/hp300/include/hp300spu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp300spu.h,v 1.1 1997/07/06 08:02:11 downsj Exp $	*/
+/*	$OpenBSD: hp300spu.h,v 1.2 1997/11/06 19:42:41 millert Exp $	*/
 /*	$NetBSD: hp300spu.h,v 1.2 1997/05/01 05:26:48 thorpej Exp $	*/
 
 /*-
@@ -58,10 +58,12 @@
 #define	HP_380		9	/* 25MHz 68040 */
 #define	HP_425		10	/* 26MHz 68040 */
 #define HP_433		11	/* 33MHz 68040 */
+#define	HP_385		12	/* 33MHz 68040 */
 
 /* values for mmuid - used to differentiate similar CPU/cache combos */
 #define	MMUID_345	1	/* 345 */
 #define	MMUID_375	3	/* 375 */
+#define	MMUID_385	2	/* 385 */
 #define	MMUID_425_T	5	/* 425t - 25MHz Trailways */
 #define	MMUID_425_S	7	/* 425s - 25MHz Strider */
 #define	MMUID_433_T	4	/* 433t - 33MHz Trailways */
@@ -95,6 +97,7 @@ extern	int mmuid;		/* MMU id */
 #include "opt_hp370.h"
 #include "opt_hp375.h"
 #include "opt_hp380.h"
+#include "opt_hp385.h"
 #include "opt_hp400.h"
 #include "opt_hp425.h"
 #include "opt_hp433.h"
@@ -111,7 +114,7 @@ extern	int mmuid;		/* MMU id */
 #define M68030
 #endif
 
-#if defined(HP380) || defined(HP425) || defined(HP433)
+#if defined(HP380) || defined(HP385) || defined(HP425) || defined(HP433)
 #define M68040
 #endif
 
diff --git a/sys/arch/hp300/stand/common/autoconf.c b/sys/arch/hp300/stand/common/autoconf.c
index 987122c8053..3c105ce3d2b 100644
--- a/sys/arch/hp300/stand/common/autoconf.c
+++ b/sys/arch/hp300/stand/common/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.1 1997/07/14 08:14:07 downsj Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.2 1997/11/06 19:42:42 millert Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.12 1997/01/30 10:32:51 thorpej Exp $	*/
 
 /*
@@ -107,6 +107,7 @@ configure()
 	case HP_380:
 		cpuspeed = MHZ_25 * 2;	/* XXX */
 		break;
+	case HP_385:
 	case HP_433:
 		cpuspeed = MHZ_33 * 2;	/* XXX */
 		break;
diff --git a/sys/arch/hp300/stand/common/machdep.c b/sys/arch/hp300/stand/common/machdep.c
index 581ba56b5ec..e7bbb0eeb32 100644
--- a/sys/arch/hp300/stand/common/machdep.c
+++ b/sys/arch/hp300/stand/common/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.1 1997/07/14 08:14:25 downsj Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.2 1997/11/06 19:42:43 millert Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1997/06/28 07:20:25 thorpej Exp $	*/
 
 /*
@@ -72,6 +72,8 @@ getmachineid()
 		cp = "375"; break;
 	case HP_380:
 		cp = "380"; break;
+	case HP_385:
+		cp = "385"; break;
 	case HP_400:
 		cp = "400"; break;
 	case HP_425:
diff --git a/sys/arch/hp300/stand/uboot/srt0.S b/sys/arch/hp300/stand/uboot/srt0.S
index 77e0b752c26..3323ac40129 100644
--- a/sys/arch/hp300/stand/uboot/srt0.S
+++ b/sys/arch/hp300/stand/uboot/srt0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: srt0.S,v 1.1 1997/07/14 08:14:58 downsj Exp $	*/
+/*	$OpenBSD: srt0.S,v 1.2 1997/11/06 19:42:45 millert Exp $	*/
 /*	$NetBSD: srt0.S,v 1.4 1997/05/12 07:56:00 thorpej Exp $	*/
 
 /*
@@ -179,8 +179,10 @@ not68030:
 	jeq	isa425
 	cmpb	#MMUID_433_T,d0		| or a 433t?
 	jeq	isa433
-	cmpb	#MMUID_433_S,d0		| last chance...
+	cmpb	#MMUID_433_S,d0		| maybe a 433s?
 	jeq	isa433
+	cmpb	#MMUID_385,d0		| last chance...
+	jeq	isa385
 	movl	#HP_380,a0@		| guess we're a 380
 	jra	ihpibcheck
 isa425:
@@ -189,6 +191,9 @@ isa425:
 isa433:
 	movl	#HP_433,a0@
 	jra	ihpibcheck
+isa385:
+	movl	#HP_385,a0@
+	jra	ihpibcheck
 
 	/*
 	 * End 68040 section
-- 
cgit v1.2.3