diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1998-05-10 11:31:22 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1998-05-10 11:31:22 +0000 |
| commit | 7da438319f65d8af95db96d85996cac4e58d24d3 (patch) | |
| tree | 6c262e4a192465807970c7caa9865f9b57ffc765 /sys/arch/hp300/stand | |
| parent | 3517e9750c30fef91dd0250badcea3be3d25c912 (diff) | |
* Remove stupid, non-working ROM printf()s from apci.c
* Add 425e autodetection.
* Increment version number.
Diffstat (limited to 'sys/arch/hp300/stand')
| -rw-r--r-- | sys/arch/hp300/stand/common/apci.c | 12 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/common/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/common/version.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/uboot/srt0.S | 4 |
4 files changed, 11 insertions, 15 deletions
diff --git a/sys/arch/hp300/stand/common/apci.c b/sys/arch/hp300/stand/common/apci.c index fc3ebc54b7e..497560e12c2 100644 --- a/sys/arch/hp300/stand/common/apci.c +++ b/sys/arch/hp300/stand/common/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.1 1997/07/14 08:14:06 downsj Exp $ */ +/* $OpenBSD: apci.c,v 1.2 1998/05/10 11:31:17 downsj Exp $ */ /* $NetBSD: apci.c,v 1.1 1997/05/12 07:41:55 thorpej Exp $ */ /* @@ -100,16 +100,6 @@ apciinit(cp) { struct apciregs *apci = (struct apciregs *)apcicnaddr; - /* - * The only system on which this will happen is a 425e, - * which does not currently have a framebuffer console - * driver. We use the ROM's output method to let the - * operator know we're switching to the APCI. - */ - userom = 1; - printf("Switching to APCI console.\n"); - userom = 0; - apci->ap_cfcr = CFCR_DLAB; apci->ap_data = APCIBRD(9600) & 0xff; apci->ap_ier = (APCIBRD(9600) >> 8) & 0xff; diff --git a/sys/arch/hp300/stand/common/machdep.c b/sys/arch/hp300/stand/common/machdep.c index e7bbb0eeb32..6c11ad64bc4 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.2 1997/11/06 19:42:43 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.3 1998/05/10 11:31:19 downsj Exp $ */ /* $NetBSD: machdep.c,v 1.4 1997/06/28 07:20:25 thorpej Exp $ */ /* @@ -82,6 +82,8 @@ getmachineid() cp = "425t"; break; case MMUID_425_S: cp = "425s"; break; + case MMUID_425_E: + cp = "425e"; break; default: cp = "425"; break; } diff --git a/sys/arch/hp300/stand/common/version.c b/sys/arch/hp300/stand/common/version.c index 3cd86c63e3b..f19cfc2ff60 100644 --- a/sys/arch/hp300/stand/common/version.c +++ b/sys/arch/hp300/stand/common/version.c @@ -1,4 +1,4 @@ -/* $OpenBSD: version.c,v 1.2 1997/09/14 07:02:02 downsj Exp $ */ +/* $OpenBSD: version.c,v 1.3 1998/05/10 11:31:20 downsj Exp $ */ /* * Record major changes in the boot code here, and increment the version @@ -14,6 +14,8 @@ * * 2.3 Added CD9660 boot support. * + * 2.4 Added/fixed 425e support. + * */ -const char version[] = "2.3"; +const char version[] = "2.4"; diff --git a/sys/arch/hp300/stand/uboot/srt0.S b/sys/arch/hp300/stand/uboot/srt0.S index 3323ac40129..59f26baec9a 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.2 1997/11/06 19:42:45 millert Exp $ */ +/* $OpenBSD: srt0.S,v 1.3 1998/05/10 11:31:21 downsj Exp $ */ /* $NetBSD: srt0.S,v 1.4 1997/05/12 07:56:00 thorpej Exp $ */ /* @@ -177,6 +177,8 @@ not68030: jeq isa425 cmpb #MMUID_425_S,d0 | how about 425s? jeq isa425 + cmpb #MMUID_425_E,d0 | or maybe a 425e? + jeq isa425 cmpb #MMUID_433_T,d0 | or a 433t? jeq isa433 cmpb #MMUID_433_S,d0 | maybe a 433s? |