diff options
| author | briggs <briggs@cvs.openbsd.org> | 1997-04-03 03:53:28 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1997-04-03 03:53:28 +0000 |
| commit | bdd1857e258311e7cc175530b0627c87702ae0ba (patch) | |
| tree | c3d4dd31b24dedfc5367243132afbb7e9fc6604b /sys/arch/mac68k/conf | |
| parent | 6ba922cb1e88a1cc2c23e22585f944c59c82edf5 (diff) | |
PR#141 from David Leonard <d@occult.fnarg.net.au> with some small mods by
me.
- Provide option (enabled in GENERIC and GENERICSBC) to disable ADB
configuration when serial console is enabled. Old behavior allows
booting even if ADB probe hangs (Apple had several ways to access
ADB).
- Configure ite0 differently--don't assume that it's only extant if it
is the console.
Diffstat (limited to 'sys/arch/mac68k/conf')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/GENERICSBC | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 60c3bb6d91c..dbc05e00496 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.17 1997/03/12 15:59:01 briggs Exp $ +# $OpenBSD: GENERIC,v 1.18 1997/04/03 03:53:25 briggs Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC @@ -59,6 +59,7 @@ options COMPAT_NOMID options COMPAT_SUNOS options ZS_CONSOLE_ABORT options DISABLE_EXT_CACHE # Don't use IIci external cache +options DISABLE_ADB_WITH_SERIAL_CONSOLE options HWDIRECT config bsd swap generic diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index 95235c4f261..ef37c30bcd7 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICSBC,v 1.3 1997/03/12 15:59:01 briggs Exp $ +# $OpenBSD: GENERICSBC,v 1.4 1997/04/03 03:53:26 briggs Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC @@ -59,6 +59,7 @@ options COMPAT_NOMID options COMPAT_SUNOS options ZS_CONSOLE_ABORT options DISABLE_EXT_CACHE # Don't use IIci external cache +options DISABLE_ADB_WITH_SERIAL_CONSOLE options HWDIRECT config bsd swap generic |