diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-13 19:36:48 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-13 19:36:48 +0000 |
| commit | 0528b1a2b8abd8de0f88c225d327ba2d5884c90b (patch) | |
| tree | 9c4a2f5a2930fe18c477736e4684dfdfa73cb7e1 /sys/arch/mac68k/conf | |
| parent | 3936daf17c6123de11a564c6c457f1d88eb1407d (diff) | |
Remove the Mac Rom Glue code completely. With the ADB ``direct'' code being
used by default, and since all PRAM accesses are either directly fiddling
with VIA registers or through ADB commands, the MRG code has no reason to
stay. This means the kernel is now not running unknown PROM code anymore.
Diffstat (limited to 'sys/arch/mac68k/conf')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/files.mac68k | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 2e494e02636..e3be16927c1 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.44 2006/01/09 20:51:45 miod Exp $ +# $OpenBSD: GENERIC,v 1.45 2006/01/13 19:36:41 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -22,7 +22,6 @@ option FPSP option FPU_EMULATE option COMPAT_SUNOS # SunOS m68k binary compatibility option ADBVERBOSE -#option MRG_ADB # Use ROM-based ADB driver option WSDISPLAY_COMPAT_RAWKBD config bsd swap generic diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK index ed5d282a06a..baf08b67f5e 100644 --- a/sys/arch/mac68k/conf/RAMDISK +++ b/sys/arch/mac68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.20 2006/01/09 20:51:45 miod Exp $ +# $OpenBSD: RAMDISK,v 1.21 2006/01/13 19:36:41 miod Exp $ # # RAMDISK - bsd.rd configuration file (non-SBC version) @@ -33,7 +33,6 @@ option M68030 option M68020 # Must have 68851 PMMU option FPSP option FPU_EMULATE -#option MRG_ADB # Use ROM-based ADB driver config bsd root on rd0a maxusers 32 diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index 43798857dff..319d2c4d597 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: files.mac68k,v 1.38 2006/01/09 20:51:45 miod Exp $ +# $OpenBSD: files.mac68k,v 1.39 2006/01/13 19:36:41 miod Exp $ # $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $ # mac68k-specific configuration info @@ -22,7 +22,6 @@ file arch/mac68k/dev/nubus.c nubus device adb {} attach adb at obio file arch/mac68k/dev/adb.c adb -file arch/mac68k/dev/adbsysasm.s adb & mrg_adb file arch/mac68k/dev/adb_direct.c adb file arch/mac68k/dev/pm_direct.c @@ -107,8 +106,6 @@ file arch/mac68k/mac68k/conf.c file arch/mac68k/mac68k/disksubr.c disk file arch/mac68k/mac68k/intr.c file arch/mac68k/mac68k/machdep.c -file arch/mac68k/mac68k/macrom.c -file arch/mac68k/mac68k/macromasm.s file arch/mac68k/mac68k/mainbus.c file arch/mac68k/mac68k/mem.c file arch/m68k/m68k/pmap_motorola.c |