diff options
| author | gene <gene@cvs.openbsd.org> | 1997-04-14 18:48:09 +0000 |
|---|---|---|
| committer | gene <gene@cvs.openbsd.org> | 1997-04-14 18:48:09 +0000 |
| commit | f9fb8c1d4aa9e92d8669c9059335d729b505c5c2 (patch) | |
| tree | d3b2f4d5d53636cb8c0dc6fec8c07957bf0c733e /sys/arch/mac68k/conf | |
| parent | bb6fa98d7de51d366e882712f55820f005d5c18e (diff) | |
Bring our incarnation of John Wittowski's direct adb driver into compatible
state with NetBSD's. The direct-to-ADB code is now enabled by default.
Using 'options MRG_ADB' will cause the kernel to revert to the 'old standby'
code.
Diffstat (limited to 'sys/arch/mac68k/conf')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/GENERICSBC | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/files.mac68k | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index df1b62b2aef..5fd7c2f64a4 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.19 1997/04/14 00:27:28 briggs Exp $ +# $OpenBSD: GENERIC,v 1.20 1997/04/14 18:47:48 gene Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC @@ -61,7 +61,7 @@ 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 +#options MRG_ADB # Use ROM-based ADB driver config bsd swap generic options GENERIC diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index e42e528bb57..47a91100241 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICSBC,v 1.5 1997/04/14 00:27:29 briggs Exp $ +# $OpenBSD: GENERICSBC,v 1.6 1997/04/14 18:47:50 gene Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC @@ -61,7 +61,7 @@ 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 +#options MRG_ADB # Use ROM-based ADB driver config bsd swap generic options GENERIC diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index e072f7c143c..28070608f8c 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: files.mac68k,v 1.15 1997/03/28 12:38:57 briggs Exp $ +# $OpenBSD: files.mac68k,v 1.16 1997/04/14 18:47:51 gene Exp $ # $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $ # mac68k-specific configuration info @@ -26,8 +26,8 @@ attach adb at obio_norm file arch/mac68k/dev/adb.c adb file arch/mac68k/dev/adbsys.c file arch/mac68k/dev/adbsysasm.s -file arch/mac68k/dev/adb_direct.c hwdirect -file arch/mac68k/dev/pm_direct.c hwdirect +file arch/mac68k/dev/adb_direct.c +file arch/mac68k/dev/pm_direct.c device asc attach asc at obio_norm |