diff options
| author | scottr <scottr@NetBSD.org> | 1996-05-19 22:29:04 +0000 |
|---|---|---|
| committer | scottr <scottr@NetBSD.org> | 1996-05-19 22:29:04 +0000 |
| commit | 820895162d48b00a5022b4a004c8ebc2ff4485e8 (patch) | |
| tree | 4c3401c2385bbe8c012db604705a03a8bb695eb1 /sys | |
| parent | d048582c60219f8400da41d2cab1a9974c1c8c2f (diff) | |
Update for new grf attachment code.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/OCELOT | 12 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/PUMA | 6 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/RAMDISK | 12 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/SPOT | 21 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/files.mac68k | 20 |
6 files changed, 50 insertions, 31 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index e2772c56188..f6657e165fe 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.36 1996/05/06 03:33:06 briggs Exp $ +# $NetBSD: GENERIC,v 1.37 1996/05/19 22:29:04 scottr Exp $ # # GENERIC @@ -66,12 +66,16 @@ options MACHINE_NONCONTIG config netbsd swap generic options GENERIC -grf0 at obio? # Graphics devices might be internal or NuBUS +intvid0 at obio? # Internal video hardware nubus0 at mainbus? ae* at nubus? -grf* 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 diff --git a/sys/arch/mac68k/conf/OCELOT b/sys/arch/mac68k/conf/OCELOT index a6f1c630182..a18cf2dfad0 100644 --- a/sys/arch/mac68k/conf/OCELOT +++ b/sys/arch/mac68k/conf/OCELOT @@ -1,4 +1,4 @@ -# $NetBSD: OCELOT,v 1.9 1996/05/06 03:33:07 briggs Exp $ +# $NetBSD: OCELOT,v 1.10 1996/05/19 22:29:06 scottr Exp $ # # OCELOT @@ -49,12 +49,16 @@ options MACHINE_NONCONTIG config netbsd swap generic -grf0 at obio? # Graphics devices might be internal or NuBUS +intvid0 at obio? # Internal video hardware nubus0 at mainbus? -ae* at nubus? -grf* at nubus? +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 9678814c48d..a361f33c365 100644 --- a/sys/arch/mac68k/conf/PUMA +++ b/sys/arch/mac68k/conf/PUMA @@ -1,4 +1,4 @@ -# $NetBSD: PUMA,v 1.11 1996/05/06 03:32:33 briggs Exp $ +# $NetBSD: PUMA,v 1.12 1996/05/19 22:29:07 scottr Exp $ # # PUMA @@ -52,7 +52,9 @@ config netbsd root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b nubus0 at mainbus? ae* at nubus? -grf* at nubus? +macvid* at nubus? + +grf* at macvid? ncrscsi0 at obio? # SCSI NCR 5380 diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK index 3a97e7897f6..028cdd9f6b9 100644 --- a/sys/arch/mac68k/conf/RAMDISK +++ b/sys/arch/mac68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.4 1996/05/06 03:33:08 briggs Exp $ +# $NetBSD: RAMDISK,v 1.5 1996/05/19 22:29:08 scottr Exp $ # RAMDISK # Support Root/swap on ramdisk @@ -41,12 +41,16 @@ options MACHINE_NONCONTIG config netbsd root on rd0a swap on rd0b -grf0 at obio? # Graphics devices might be internal or NuBUS +intvid0 at obio? # Internal video hardware nubus0 at mainbus? -ae* at nubus? -grf* at nubus? +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/SPOT b/sys/arch/mac68k/conf/SPOT index 50c0fae09a5..ea1dd7fe5cc 100644 --- a/sys/arch/mac68k/conf/SPOT +++ b/sys/arch/mac68k/conf/SPOT @@ -1,4 +1,4 @@ -# $NetBSD: SPOT,v 1.6 1996/05/06 03:33:09 briggs Exp $ +# $NetBSD: SPOT,v 1.7 1996/05/19 22:29:09 scottr Exp $ # # SPOT @@ -6,7 +6,7 @@ include "std.mac68k" maxusers 16 -makeoptions CC="cc -m68030 -m68881" +makeoptions CC="cc -m68030" options MAXFDESCS=2048 # Standard system options @@ -24,7 +24,7 @@ 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 NFSCLIENT # Sun NFS-compatible filesystem #options NULLFS # Null (formerly loop-back) filesystem options CD9660 # ISO-9660 w/ RockRidge options KERNFS # kernel data-structure filesystem @@ -36,6 +36,8 @@ options PROCFS # Process filesystem options SCSI #options SCSIDEBUG +#options NCR5380_DEBUG +#options SBC_DEBUG # Networking options options INET @@ -63,16 +65,11 @@ options MACHINE_NONCONTIG config netbsd swap generic options GENERIC -grf0 at obio? # Graphics devices might be internal or NuBUS +intvid0 at obio? # Internal video hardware -nubus0 at mainbus? - -ae* at nubus? -grf* at nubus? - -#ncrscsi0 at mainbus? # SCSI NCR 5380 -#ncr96scsi0 at mainbus? # SCSI NCR 53C96 -sbc0 at mainbus? # MI NCR 5380 SCSI Bus Controller +#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 ? diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index cfeee0a96b4..cb1a7b2fd67 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: files.mac68k,v 1.47 1996/05/18 18:53:50 briggs Exp $ +# $NetBSD: files.mac68k,v 1.48 1996/05/19 22:29:10 scottr Exp $ # mac68k-specific configuration info @@ -28,12 +28,20 @@ device asc attach asc at obio file arch/mac68k/dev/asc.c asc -device grf -attach grf at nubus with grf_mv -attach grf at obio with grf_iv +define grfbus {} +file arch/mac68k/dev/grf_subr.c grfbus + +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 -file arch/mac68k/dev/grf_mv.c grf_mv -file arch/mac68k/dev/grf_iv.c grf_iv device ae: ifnet, ether attach ae at nubus |
