diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 95 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/GENERICSBC | 93 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/PUMA | 15 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/SPOT | 14 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/TIGER | 14 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/std.mac68k | 28 |
6 files changed, 88 insertions, 171 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 9d83d6ec757..1a406cfc16f 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,81 +1,46 @@ -# $OpenBSD: GENERIC,v 1.21 1997/06/05 18:52:40 gene Exp $ +# $OpenBSD: GENERIC,v 1.22 1997/06/23 02:26:35 gene Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # -# GENERIC +# GENERIC - an all-in-one kernel for the mac68k -include "arch/mac68k/conf/std.mac68k" +machine mac68k m68k +include "conf/GENERIC" -maxusers 16 - -# Standard system option -option DIAGNOSTIC # DEBUG for extra kernel debugging -option KTRACE # system call tracing support -#option KGDB # support for kernel gdb -#option GDB # support for normal gdb -#option KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate - -# Filesystem option -option FIFO # POSIX fifo support (in all filesystems) -option DDB -option FFS -option QUOTA # fast filesystem with user and group quotas -option MFS # memory-based filesystem -#option NFSSERVER # Sun NFS-compatible filesystem -option NFSCLIENT # Sun NFS-compatible filesystem -option NULLFS # Null (formerly loop-back) filesystem -option CD9660 # ISO-9660 w/ RockRidge -option KERNFS # kernel data-structure filesystem -option FDESC # user file descriptor filesystem -#option UMAPFS # uid/gid remapping filesystem -#option LFS # Log-based filesystem (still experimental) -#option PORTAL # portal filesystem (still experimental) -option PROCFS # Process filesystem - -option LKM # loadable kernel modules - -option SCSI -#option SCSIDEBUG - -# Networking option -option INET -option TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP -option GATEWAY # IP packet forwarding -option IPFILTER -#option ISO # OSI networking -#option TPIP -#option EON -option COMPAT_43 -option NS -option MAPMEM -option SYSVSHM,SYSVSEM,SYSVMSG -option PPP_BSDCOMP,PPP_DEFLATE - -# Mac-specific option +# Mac-specific options option M68040 option M68030 option M68020 # Must have 68851 PMMU option FPSP option FPU_EMULATE -option COMPAT_NOMID -option COMPAT_SUNOS +option COMPAT_SUNOS # SunOS m68k binary compatiblity option ZS_CONSOLE_ABORT option DISABLE_EXT_CACHE # Don't use IIci external cache option DISABLE_ADB_WITH_SERIAL_CONSOLE -#option MRG_ADB # Use ROM-based ADB driver +#option MRG_ADB # Use ROM-based ADB driver config bsd swap generic -option GENERIC +maxusers 16 + +mainbus0 at root +fpu0 at mainbus? -sn* at obio? # Internal ethernet +# on-board I/O +obio0 at mainbus? -asc0 at obio? # ASC/EASC audio -intvid0 at obio? # Internal video hardware +adb0 at obio? +asc0 at obio? # ASC/EASC audio +esp0 at obio? # SCSI NCR 53C9x +esp1 at obio? # SCSI NCR 53C9x +intvid0 at obio? # Internal video hardware +sn* at obio? # Internal ethernet +zsc0 at obio? # Zilog serial chip +zstty* at zsc? channel ? nubus0 at mainbus? -ae* at nubus? -sn* at nubus? -macvid* at nubus? +ae* at nubus? # Most Apple Ethernet Cards +macvid* at nubus? # NuBus video cards +sn* at nubus? # SONIC-based ethernet cards # Attach grf semantics to all video hardware as it is found grf* at intvid? @@ -88,9 +53,6 @@ ite0 at grf? ncrscsi0 at obio? # SCSI NCR 5380 #sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller -esp0 at obio? # SCSI NCR 53C9x -esp1 at obio? # SCSI NCR 53C9x - scsibus* at scsi? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives @@ -98,12 +60,3 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives ch* at scsibus? target ? lun ? # SCSI autochangers ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown - -pseudo-device pty 16 -pseudo-device bpfilter 12 -pseudo-device vnd 2 -pseudo-device ccd 2 -pseudo-device ppp 2 -pseudo-device loop -pseudo-device sl -#pseudo-device ipfilter diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index 3a36f2f4702..24eea01a79c 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,81 +1,46 @@ -# $OpenBSD: GENERICSBC,v 1.7 1997/06/05 18:52:41 gene Exp $ +# $OpenBSD: GENERICSBC,v 1.8 1997/06/23 02:26:36 gene Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERICSBC --- our generic kernel using the SBC SCSI driver -include "arch/mac68k/conf/std.mac68k" +machine mac68k m68k +include "conf/GENERIC" -maxusers 16 - -# Standard system option -option DIAGNOSTIC # DEBUG for extra kernel debugging -option KTRACE # system call tracing support -#option KGDB # support for kernel gdb -#option GDB # support for normal gdb -#option KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate - -# Filesystem option -option FIFO # POSIX fifo support (in all filesystems) -option DDB -option FFS -option QUOTA # fast filesystem with user and group quotas -option MFS # memory-based filesystem -#option NFSSERVER # Sun NFS-compatible filesystem -option NFSCLIENT # Sun NFS-compatible filesystem -option NULLFS # Null (formerly loop-back) filesystem -option CD9660 # ISO-9660 w/ RockRidge -option KERNFS # kernel data-structure filesystem -option FDESC # user file descriptor filesystem -#option UMAPFS # uid/gid remapping filesystem -#option LFS # Log-based filesystem (still experimental) -#option PORTAL # portal filesystem (still experimental) -option PROCFS # Process filesystem - -option LKM # loadable kernel modules - -option SCSI -#option SCSIDEBUG - -# Networking option -option INET -option TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP -option GATEWAY # IP packet forwarding -option IPFILTER -#option ISO # OSI networking -#option TPIP -#option EON -option COMPAT_43 -option NS -option MAPMEM -option SYSVSHM,SYSVSEM,SYSVMSG -option PPP_BSDCOMP,PPP_DEFLATE - -# Mac-specific option +# Mac-specific options option M68040 option M68030 option M68020 # Must have 68851 PMMU option FPSP option FPU_EMULATE -option COMPAT_NOMID -option COMPAT_SUNOS +option COMPAT_SUNOS # SunOS m68k binary compatiblity option ZS_CONSOLE_ABORT option DISABLE_EXT_CACHE # Don't use IIci external cache option DISABLE_ADB_WITH_SERIAL_CONSOLE -#option MRG_ADB # Use ROM-based ADB driver +#option MRG_ADB # Use ROM-based ADB driver config bsd swap generic -option GENERIC +maxusers 16 + +mainbus0 at root +fpu0 at mainbus? -sn* at obio? # Internal ethernet +# on-board I/O +obio0 at mainbus? -asc0 at obio? # ASC/EASC audio -intvid0 at obio? # Internal video hardware +adb0 at obio? +asc0 at obio? # ASC/EASC audio +esp0 at obio? # SCSI NCR 53C9x +esp1 at obio? # SCSI NCR 53C9x +intvid0 at obio? # Internal video hardware +sn* at obio? # Internal ethernet +zsc0 at obio? # Zilog serial chip +zstty* at zsc? channel ? nubus0 at mainbus? -ae* at nubus? -sn* at obio? -macvid* at nubus? +ae* at nubus? # Most Apple Ethernet Cards +macvid* at nubus? # NuBus video cards +sn* at nubus? # SONIC-based ethernet cards # Attach grf semantics to all video hardware as it is found grf* at intvid? @@ -88,9 +53,6 @@ ite0 at grf? #ncrscsi0 at obio? # SCSI NCR 5380 sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller -esp0 at obio? # SCSI NCR 53C9x -esp1 at obio? # SCSI NCR 53C9x - scsibus* at scsi? sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives @@ -98,12 +60,3 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives ch* at scsibus? target ? lun ? # SCSI autochangers ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown - -pseudo-device pty 16 -pseudo-device bpfilter 12 -pseudo-device vnd 2 -pseudo-device ccd 2 -pseudo-device ppp 2 -pseudo-device loop -pseudo-device sl -#pseudo-device ipfilter diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA index c04ae5cf97f..a5c59f7c2ac 100644 --- a/sys/arch/mac68k/conf/PUMA +++ b/sys/arch/mac68k/conf/PUMA @@ -1,4 +1,4 @@ -# $OpenBSD: PUMA,v 1.12 1997/06/05 18:52:42 gene Exp $ +# $OpenBSD: PUMA,v 1.13 1997/06/23 02:26:36 gene Exp $ # $NetBSD: PUMA,v 1.13 1996/08/05 01:52:15 scottr Exp $ # # PUMA @@ -9,9 +9,6 @@ maxusers 16 option MAXFDESCS=2048 -# Standard system option -option SWAPPAGER, DEVPAGER # paging - # Filesystem option option FIFO # POSIX fifo support (in all filesystems) option KTRACE @@ -52,6 +49,16 @@ option COMPAT_12 config bsd root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b +mainbus0 at root + +fpu0 at mainbus? + +# on-board I/O +obio0 at mainbus? + +adb0 at obio? +zsc0 at obio? +zstty* at zsc? channel ? nubus0 at mainbus? ae* at nubus? diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT index 995f529dfcf..27835df30e3 100644 --- a/sys/arch/mac68k/conf/SPOT +++ b/sys/arch/mac68k/conf/SPOT @@ -1,4 +1,4 @@ -# $OpenBSD: SPOT,v 1.11 1997/06/05 18:52:42 gene Exp $ +# $OpenBSD: SPOT,v 1.12 1997/06/23 02:26:37 gene Exp $ # $NetBSD: SPOT,v 1.22 1997/01/20 00:31:42 scottr Exp $ # # SPOT @@ -7,7 +7,7 @@ include "arch/mac68k/conf/std.mac68k" maxusers 16 -makeoption COPTS="-O2 -m68030" +makeoptions COPTS="-O2 -m68030" # Standard system option option DIAGNOSTIC # DEBUG for extra kernel debugging @@ -52,6 +52,16 @@ option RTC_OFFSET=360 # hardware clock is this many mins. west of GMT config bsd swap generic option GENERIC +mainbus0 at root + +fpu0 at mainbus? + +# on-board I/O +obio0 at mainbus? + +adb0 at obio? +zsc0 at obio? +zstty* at zsc? channel ? nubus0 at mainbus? ae* at nubus? diff --git a/sys/arch/mac68k/conf/TIGER b/sys/arch/mac68k/conf/TIGER index 7d82affe28b..b152f50e7e3 100644 --- a/sys/arch/mac68k/conf/TIGER +++ b/sys/arch/mac68k/conf/TIGER @@ -1,4 +1,4 @@ -# $OpenBSD: TIGER,v 1.8 1997/06/05 18:52:43 gene Exp $ +# $OpenBSD: TIGER,v 1.9 1997/06/23 02:26:38 gene Exp $ # $NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $ # # Allen's Q700 @@ -7,7 +7,7 @@ include "arch/mac68k/conf/std.mac68k" maxusers 16 -makeoption COPTS="-O2 -m68040" +makeoptions COPTS="-O2 -m68040" # Standard system option option DIAGNOSTIC # DEBUG for extra kernel debugging @@ -51,6 +51,16 @@ option ZS_CONSOLE_ABORT config bsd swap generic option GENERIC +mainbus0 at root + +fpu0 at mainbus? + +# on-board I/O +obio0 at mainbus? + +adb0 at obio? +zsc0 at obio? +zstty* at zsc? channel ? sn* at obio? # SONIC ethernet (68040) # no internal video, but need interrupts, etc. diff --git a/sys/arch/mac68k/conf/std.mac68k b/sys/arch/mac68k/conf/std.mac68k index 2da349674c3..cbe84803e1b 100644 --- a/sys/arch/mac68k/conf/std.mac68k +++ b/sys/arch/mac68k/conf/std.mac68k @@ -1,31 +1,15 @@ -# $OpenBSD: std.mac68k,v 1.9 1997/03/08 16:16:47 briggs Exp $ +# $OpenBSD: std.mac68k,v 1.10 1997/06/23 02:26:38 gene Exp $ # $NetBSD: std.mac68k,v 1.18 1997/02/13 17:29:43 scottr Exp $ # -# standard Macintosh information. -# roughly copied from std.sparc 14 Oct 1993. +# Standard mac68k information in all kernels. machine mac68k m68k -mainbus0 at root - -fpu0 at mainbus? - -# on-board I/O -obio0 at mainbus? - -adb0 at obio? -zsc0 at obio? -zstty* at zsc? channel ? - -options TIMEZONE=0 # minutes west of GMT--read from booter -options DST=0 # daylight savings time/summer time - -option HZ=60 # mac clock runs at 60hz - # Executable support option EXEC_AOUT # a.out binary support option EXEC_SCRIPT # shell script support -# VM pager support -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices; REQUIRED +# Stuff every mac68k should have +option DEVPAGER # mmap() of devices +option SWAPPAGER # mmap() of devices +option HZ=60 # ticks/second of the mac68k RTC |