Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force ARCS console for IP20 until the console-on-zs crashing problem is 

fixed.  Store the board revision for future use, while we're at it.
This commit is contained in:
sekiya 2003-12-30 23:56:19 +00:00
parent 1cf4c96f39
commit d721fc82ce
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/sgimips/sgimips/console.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: console.c,v 1.15 2003/12/16 10:20:10 sekiya Exp $ */
/* $NetBSD: console.c,v 1.16 2003/12/30 23:56:19 sekiya Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.15 2003/12/16 10:20:10 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.16 2003/12/30 23:56:19 sekiya Exp $");
#include "opt_kgdb.h"
#include "opt_machtypes.h"
@ -106,10 +106,12 @@ consinit()
}
}
#endif
#if (defined(IP2X)) && (NZSC > 0)
if (mach_type == MACH_SGI_IP20 || mach_type == MACH_SGI_IP22) {
/* zs console on IP20 crashes the machine fast, use ARCS for now */
if (mach_type == MACH_SGI_IP20)
goto force_arcs;
else if (mach_type == MACH_SGI_IP22) {
if (strlen(consdev) == 9 &&
strncmp(consdev, "serial", 6) == 0 &&
(consdev[7] == '0' || consdev[7] == '1')) {

7
sys/arch/sgimips/sgimips/ip2x.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip2x.c,v 1.1 2003/12/15 13:02:28 sekiya Exp $ */
/* $NetBSD: ip2x.c,v 1.2 2003/12/30 23:56:19 sekiya Exp $ */
/*
* Copyright (c) 2001, 2002 Rafal K. Boni
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.1 2003/12/15 13:02:28 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.2 2003/12/30 23:56:19 sekiya Exp $");
#include "opt_cputype.h"
#include "opt_machtypes.h"
@ -84,6 +84,9 @@ ip2x_init(void)
{
mach_type = MACH_SGI_IP20;
int23addr = 0x1fb801c0;
sysid = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd0000);
mach_boardrev = (sysid & 0x7000) >> 12;
}
else
{