diff options
Diffstat (limited to 'sys/arch/mac68k/conf')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 22 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/Makefile.mac68k | 26 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/OCELOT | 16 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/PUMA | 18 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/RAMDISK | 17 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/SPOT | 94 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/files.mac68k | 87 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/std.mac68k | 20 |
8 files changed, 232 insertions, 68 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 7b5363e62e9..0c3b7e45f4d 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.32 1995/11/21 05:00:37 briggs Exp $ +# $NetBSD: GENERIC,v 1.37 1996/05/19 22:29:04 scottr Exp $ # # GENERIC @@ -49,10 +49,12 @@ options COMPAT_43 options NS options MAPMEM options SYSVSHM,SYSVSEM,SYSVMSG +options PPP_BSDCOMP,PPP_DEFLATE # Mac-specific options options M68040 -options M68030 # Includes the 020+851 +options M68030 +options M68020 # Must have 68851 PMMU options FPSP options FPU_EMULATE options COMPAT_NOMID @@ -64,12 +66,19 @@ options MACHINE_NONCONTIG config bsd swap generic options GENERIC -ae* at nubus0 slot -1 id ? claimed 0 +sn0 at obio? # SONIC ethernet (68040) -sn0 at mainbus? # SONIC ethernet (68040) +intvid0 at obio? # Internal video hardware +grf* at intvid? -ncrscsi0 at mainbus? # SCSI NCR 5380 -ncr96scsi0 at mainbus? # SCSI NCR 53C96 +nubus0 at mainbus? + +ae* at nubus? +macvid* at nubus? +grf* at macvid? + +ncrscsi0 at obio? # SCSI NCR 5380 +ncr96scsi0 at obio? # SCSI NCR 53C96 scsibus* at scsi? sd* at scsibus? target ? lun ? @@ -77,7 +86,6 @@ st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? -su* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? pseudo-device pty 16 diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index afdc4e51d05..13f0f1ea435 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.mac68k,v 1.34 1996/02/09 02:21:26 mycroft Exp $ +# $NetBSD: Makefile.mac68k,v 1.38 1996/05/11 16:12:20 mycroft Exp $ # Makefile for NetBSD # @@ -21,13 +21,12 @@ # DEBUG is set to -g if debugging. # PROF is set to -pg if profiling. -AS= as -AWK= awk -CC= cc -CPP= cpp -LD= ld -STRIP= strip -d -TOUCH= touch -f -c +AS?= as +CC?= cc +CPP?= cpp +LD?= ld +STRIP?= strip -d +TOUCH?= touch -f -c # source tree is located via $S relative to the compilation directory S= ../../../.. @@ -35,8 +34,9 @@ MAC68K= ../.. INCLUDES= -I. -I$S/arch -I$S CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmac68k -CFLAGS= ${DEBUG} -O -Werror -msoft-float -AFLAGS= -x assembler-with-cpp -traditional-cpp -DLOCORE +GCCWFLAGS= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-uninitialized +CFLAGS= ${DEBUG} -O ${GCCWFLAGS} -msoft-float +AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE LINKFLAGS= -n -Ttext 0 -e start ### Find out what to use for libkern. @@ -150,7 +150,7 @@ links: SRCS= ${MAC68K}/mac68k/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} -depend: .depend +depend:: .depend .depend: ${SRCS} assym.h param.c mkdep ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} @@ -162,9 +162,7 @@ depend: .depend autoconf.o conf.o: Makefile # depend on network or filesystem configuration -uipc_domain.o uipc_proto.o vfs_conf.o: Makefile -if_tun.o if_loop.o if_ethersubr.o: Makefile -in_proto.o: Makefile +uipc_proto.o vfs_conf.o: Makefile # depend on maxusers genassym.o machdep.o: Makefile diff --git a/sys/arch/mac68k/conf/OCELOT b/sys/arch/mac68k/conf/OCELOT index 46654b0dd08..c672d038e67 100644 --- a/sys/arch/mac68k/conf/OCELOT +++ b/sys/arch/mac68k/conf/OCELOT @@ -1,4 +1,4 @@ -# $NetBSD: OCELOT,v 1.6 1995/11/21 05:00:34 briggs Exp $ +# $NetBSD: OCELOT,v 1.10 1996/05/19 22:29:06 scottr Exp $ # # OCELOT @@ -40,7 +40,7 @@ options SYSVSHM,SYSVSEM,SYSVMSG # Mac-specific options options M68040 -options M68030 # Includes the 020+851 +options M68030 options COMPAT_NOMID options COMPAT_SUNOS options COMPAT_09 @@ -49,8 +49,16 @@ options MACHINE_NONCONTIG config bsd swap generic -ae0 at nubus0 slot -1 id ? claimed 0 -ae1 at nubus0 slot -1 id ? claimed 0 +intvid0 at obio? # Internal video hardware + +nubus0 at mainbus? + +ae* at nubus? +macvid* at nubus? + +# Attach grf semantics to all video hardware as it is found +grf* at intvid? +grf* at macvid? ncrscsi0 at mainbus? # SCSI NCR 5380 ncr96scsi0 at mainbus? # SCSI NCR 53C96 diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA index d8b4bffccee..a5ace910f90 100644 --- a/sys/arch/mac68k/conf/PUMA +++ b/sys/arch/mac68k/conf/PUMA @@ -1,4 +1,4 @@ -# $NetBSD: PUMA,v 1.7 1995/11/21 05:00:36 briggs Exp $ +# $NetBSD: PUMA,v 1.12 1996/05/19 22:29:07 scottr Exp $ # # PUMA @@ -40,7 +40,7 @@ options MAPMEM options SYSVSHM,SYSVSEM,SYSVMSG # Mac-specific options -options M68030 # Includes the 020+851 +options M68030 options MACHINE_NONCONTIG options COMPAT_NOMID options COMPAT_SUNOS @@ -49,9 +49,14 @@ options COMPAT_10 config bsd root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b -ae* at nubus0 slot -1 id ? claimed 0 +nubus0 at mainbus? -ncrscsi0 at mainbus? # SCSI NCR 5380 +ae* at nubus? +macvid* at nubus? + +grf* at macvid? + +ncrscsi0 at obio? # SCSI NCR 5380 scsibus* at scsi? sd* at scsibus? target ? lun ? @@ -64,3 +69,8 @@ pseudo-device vnd 4 pseudo-device loop pseudo-device ppp pseudo-device sl + +# Puma-specific options + +# Try linked commands on all targets +options TRY_SCSI_LINKED_COMMANDS=0x7f diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK index 39233c7f48e..e56934e2b5d 100644 --- a/sys/arch/mac68k/conf/RAMDISK +++ b/sys/arch/mac68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.1 1995/11/21 05:02:02 briggs Exp $ +# $NetBSD: RAMDISK,v 1.5 1996/05/19 22:29:08 scottr Exp $ # RAMDISK # Support Root/swap on ramdisk @@ -31,7 +31,8 @@ options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP # Mac-specific options options M68040 -options M68030 # Includes the 020+851 +options M68030 +options M68020 # Must have 68851 PMMU options FPSP options FPU_EMULATE options COMPAT_09 @@ -40,9 +41,16 @@ options MACHINE_NONCONTIG config bsd root on rd0a swap on rd0b -rd0 at mainbus? +intvid0 at obio? # Internal video hardware -ae* at nubus0 slot -1 id ? claimed 0 +nubus0 at mainbus? + +ae* at nubus? +macvid* at nubus? + +# Attach grf semantics to all video hardware as it is found +grf* at intvid? +grf* at macvid? ncrscsi0 at mainbus? # SCSI NCR 5380 ncr96scsi0 at mainbus? # SCSI NCR 53C96 @@ -53,6 +61,7 @@ st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? ch* at scsibus? target ? lun ? +pseudo-device rd 2 pseudo-device ppp pseudo-device sl pseudo-device loop diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT new file mode 100644 index 00000000000..a3c107533d9 --- /dev/null +++ b/sys/arch/mac68k/conf/SPOT @@ -0,0 +1,94 @@ +# $NetBSD: SPOT,v 1.8 1996/05/20 03:23:36 scottr Exp $ +# +# SPOT + +include "std.mac68k" + +maxusers 16 + +makeoptions CC="cc -m68030" +options MAXFDESCS=2048 + +# Standard system options +options SWAPPAGER, VNODEPAGER, DEVPAGER # paging +options DIAGNOSTIC # DEBUG for extra kernel debugging +options KTRACE # system call tracing support +#options KGDB # support for kernel gdb +#options GDB # support for normal gdb +#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate + +# Filesystem options +options FIFO # POSIX fifo support (in all filesystems) +options DDB +options FFS +options QUOTA # fast filesystem with user and group quotas +options MFS # memory-based filesystem +#options NFSSERVER # Sun NFS-compatible filesystem +#options NFSCLIENT # Sun NFS-compatible filesystem +#options NULLFS # Null (formerly loop-back) filesystem +options CD9660 # ISO-9660 w/ RockRidge +options KERNFS # kernel data-structure filesystem +options FDESC # user file descriptor filesystem +#options UMAPFS # uid/gid remapping filesystem +#options LFS # Log-based filesystem (still experimental) +#options PORTAL # portal filesystem (still experimental) +options PROCFS # Process filesystem + +options SCSI +#options SCSIDEBUG +#options NCR5380_DEBUG +#options SBC_DEBUG + +# Networking options +options INET +options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +options GATEWAY # IP packet forwarding +#options ISO # OSI networking +#options TPIP +#options EON +options PPP_BSDCOMP +#options PPP_DEFLATE +options COMPAT_42 +options COMPAT_43 +#options NS +options MAPMEM +options SYSVSHM,SYSVSEM,SYSVMSG + +# Mac-specific options +options M68030 +options COMPAT_NOMID +options COMPAT_SUNOS +options COMPAT_09 +options COMPAT_10 +options MACHINE_NONCONTIG + +config bsd swap generic +options GENERIC + +intvid0 at obio? # Internal video hardware + +nubus0 at mainbus? + +ae* at nubus? +macvid* at nubus? + +# Attach grf semantics to all video hardware as it is found +grf* at intvid? +grf* at macvid? + +#ncrscsi0 at obio? # SCSI NCR 5380 +#ncr96scsi0 at obio? # SCSI NCR 53C96 +sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller + +scsibus* at scsi? +sd* at scsibus? target ? lun ? +st* at scsibus? target ? lun ? +cd* at scsibus? target ? lun ? +ch* at scsibus? target ? lun ? + +pseudo-device pty 32 +pseudo-device bpfilter 16 +pseudo-device vnd 2 +pseudo-device ppp 2 +pseudo-device loop +#pseudo-device sl diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index 98992087763..feec7ae9fa1 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: files.mac68k,v 1.39 1996/02/07 16:34:28 scottr Exp $ +# $NetBSD: files.mac68k,v 1.48 1996/05/19 22:29:10 scottr Exp $ # mac68k-specific configuration info @@ -7,50 +7,88 @@ maxpartitions 8 maxusers 2 8 64 -device mainbus at root { } # no locators (yet?) +device mainbus { } # no locators (yet?) +attach mainbus at root -device nubus at mainbus { slot = -1, id = -1, claimed = 0 } -file arch/mac68k/dev/nubus.c nubus +device obio {} +attach obio at mainbus +file arch/mac68k/dev/obio.c obio -device ser at mainbus: tty -file arch/mac68k/dev/ser.c ser needs-flag +device nubus {} +attach nubus at mainbus +file arch/mac68k/dev/nubus.c nubus -device adb at mainbus +device adb +attach adb at obio file arch/mac68k/dev/adb.c adb file arch/mac68k/dev/adbsys.c file arch/mac68k/dev/adbsysasm.s -device asc at mainbus +device asc +attach asc at obio file arch/mac68k/dev/asc.c asc -device fpu at mainbus -file arch/mac68k/mac68k/fpu.c fpu +define grfbus {} +file arch/mac68k/dev/grf_subr.c grfbus -device grf at nubus -file arch/mac68k/dev/grf.c grf needs-count -file arch/mac68k/dev/grf_mv.c grf -file arch/mac68k/dev/grf_iv.c grf -device ite at mainbus -file arch/mac68k/dev/ite.c ite needs-flag +device intvid: grfbus +attach intvid at obio +file arch/mac68k/dev/grf_iv.c intvid + +device macvid: grfbus +attach macvid at nubus +file arch/mac68k/dev/grf_mv.c macvid + +device grf {} # eventually, we'll attach ITEs here +attach grf at grfbus +file arch/mac68k/dev/grf.c grf needs-flag -device ae at nubus: ifnet, ether +device ae: ifnet, ether +attach ae at nubus file arch/mac68k/dev/if_ae.c ae needs-flag -device sn at mainbus: ifnet, ether +device ite +attach ite at obio +file arch/mac68k/dev/ite.c ite needs-flag + +device sn: ifnet, ether +attach sn at obio file arch/mac68k/dev/if_sn.c sn needs-flag include "../../../scsi/files.scsi" -device ncrscsi at mainbus: scsi +# Option 1 for ncr5380 support +device ncrscsi: scsi +attach ncrscsi at obio file arch/mac68k/dev/mac68k5380.c ncrscsi needs-flag -device ncr96scsi at mainbus: scsi +# Option 2 for ncr5380 support +device sbc: scsi, ncr5380sbc +attach sbc at obio +file arch/mac68k/dev/sbc.c sbc + +device ncr96scsi: scsi +attach ncr96scsi at obio file arch/mac68k/dev/scsi96.c ncr96scsi needs-flag -device sbc at mainbus: scsi, ncr5380sbc -file arch/mac68k/dev/ncr_sbc.c sbc +device zsc { channel = -1 } +attach zsc at obio +file arch/mac68k/dev/zs.c zsc needs-flag +file arch/mac68k/dev/z8530sc.c zsc +#file dev/ic/z8530sc.c zsc + +device zstty: tty +attach zstty at zsc +file arch/mac68k/dev/z8530tty.c zstty needs-flag +#file dev/ic/z8530tty.c zstty needs-flag + +# This one is out of alphabetical order +device fpu +attach fpu at obio +file arch/mac68k/mac68k/fpu.c fpu file arch/m68k/m68k/copy.s +file arch/m68k/m68k/db_memrw.c ddb include "../../m68k/fpe/files.fpe" file arch/mac68k/mac68k/autoconf.c @@ -74,8 +112,9 @@ file dev/cons.c file dev/cninit.c # RAM Disk for installs -device rd at mainbus -file dev/ramdisk.c rd needs-count +# These files are out of order +pseudo-device rd +file dev/ramdisk.c rd needs-flag file arch/mac68k/dev/rd_root.c ramdisk_hooks major {sd = 4} diff --git a/sys/arch/mac68k/conf/std.mac68k b/sys/arch/mac68k/conf/std.mac68k index 96abcb3619f..e51dbf79012 100644 --- a/sys/arch/mac68k/conf/std.mac68k +++ b/sys/arch/mac68k/conf/std.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: std.mac68k,v 1.8 1995/11/21 05:05:51 briggs Exp $ +# $NetBSD: std.mac68k,v 1.12 1996/05/18 18:53:56 briggs Exp $ # # standard Macintosh information. # roughly copied from std.sparc 14 Oct 1993. @@ -7,17 +7,15 @@ machine mac68k m68k mainbus0 at root -nubus0 at mainbus0 -ite0 at mainbus0 -adb0 at mainbus0 +# on-board I/O +obio0 at mainbus? -fpu0 at mainbus0 - -asc0 at mainbus0 - -ser0 at mainbus0 -grf0 at nubus0 slot -1 id ? claimed 0 -grf1 at nubus0 slot -1 id ? claimed 0 +adb0 at obio? +asc0 at obio? +fpu0 at obio? +ite0 at obio? +zsc0 at obio? +zstty* at zsc? channel ? options TIMEZONE=0 # minutes west of GMT--read from booter options DST=0 # daylight savings rules--obsolete |