From ee58c485bf3d2344dce0708a6d1f55c1879eccd0 Mon Sep 17 00:00:00 2001 From: scw Date: Sat, 25 Nov 2000 19:33:39 +0000 Subject: [PATCH] Add CD9660, plus some general cleanup. --- sys/arch/mvme68k/conf/GENERIC | 29 +++++++++++++++-------------- sys/arch/mvme68k/conf/VME147 | 21 +++++++++------------ sys/arch/mvme68k/conf/VME162 | 16 +++++++--------- sys/arch/mvme68k/conf/VME167 | 20 +++++++++----------- sys/arch/mvme68k/conf/VME172 | 18 ++++++++---------- sys/arch/mvme68k/conf/VME177 | 20 +++++++++----------- 6 files changed, 57 insertions(+), 67 deletions(-) diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index 60e6e0b8ff73..ecdc1b8e4c3b 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,8 +1,8 @@ -# $NetBSD: GENERIC,v 1.16 2000/11/20 19:35:28 scw Exp $ +# $NetBSD: GENERIC,v 1.17 2000/11/25 19:33:39 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" -#ident "GENERIC-$Revision: 1.16 $" +#ident "GENERIC-$Revision: 1.17 $" # Boards this kernel supports options MVME147 @@ -30,6 +30,7 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION @@ -43,14 +44,14 @@ options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_DEBUG # debug for IP security -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP #options EON -options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13, COMPAT_14 -options COMPAT_SUNOS +#options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13, COMPAT_14 +#options COMPAT_SUNOS #options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries #options COMPAT_LINUX # compatibility with Linux/m68k binaries #options EXEC_ELF32 # 32-bit ELF executables (Linux) @@ -83,13 +84,13 @@ mainbus0 at root pcc0 at mainbus0 vmepcc0 at pcc? vme0 at vmepcc0 -zsc* at pcc? ipl 4 clock0 at pcc? ipl 5 +zsc* at pcc? ipl 4 le0 at pcc? ipl 3 wdsc0 at pcc? ipl 2 -lpt* at pcc? ipl 1 +lpt0 at pcc? ipl 1 -# MVME162 and MVME167 shared devices +# MVME16x and MVME17x shared devices pcctwo0 at mainbus0 vmetwo0 at mainbus0 vme0 at vmetwo0 @@ -97,12 +98,12 @@ clock0 at pcctwo? ipl 5 ie0 at pcctwo? ipl 3 ncrsc0 at pcctwo? ipl 2 -# MVME162 specific devices +# MVME162/MVME172 specific devices zsc* at pcctwo? ipl 4 -# MVME167 specific devices +# MVME167/MVME177 specific devices clmpcc0 at pcctwo? ipl 4 -lpt* at pcctwo? ipl 1 +lpt0 at pcctwo? ipl 1 # Common front-end for MVME147 and MVME162 `zs' device zstty* at zsc? channel ? @@ -116,6 +117,6 @@ scsibus* at ncrsc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # SCSI unknown +#ch* at scsibus? target ? lun ? +#ss* at scsibus? target ? lun ? # SCSI scanners +#uk* at scsibus? target ? lun ? # SCSI unknown diff --git a/sys/arch/mvme68k/conf/VME147 b/sys/arch/mvme68k/conf/VME147 index d9da0909d701..fd6fe799a114 100644 --- a/sys/arch/mvme68k/conf/VME147 +++ b/sys/arch/mvme68k/conf/VME147 @@ -1,15 +1,14 @@ -# $NetBSD: VME147,v 1.29 2000/03/18 22:33:02 scw Exp $ +# $NetBSD: VME147,v 1.30 2000/11/25 19:33:40 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" # Boards this kernel supports; need at lest the correct one options MVME147 -maxusers 2 +maxusers 4 #options DDB - -options DIAGNOSTIC, DEBUG +#options DIAGNOSTIC, DEBUG #options SYSVSHM options KTRACE @@ -19,6 +18,7 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION @@ -27,7 +27,7 @@ file-system MFS # Networking options options INET -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP @@ -58,13 +58,14 @@ mainbus0 at root pcc0 at mainbus0 -zsc* at pcc? ipl 4 -zstty* at zsc? channel ? - clock0 at pcc? ipl 5 +zsc* at pcc? ipl 4 le0 at pcc? ipl 3 wdsc0 at pcc? ipl 2 lpt0 at pcc? ipl 1 + +zstty* at zsc? channel ? + vmepcc0 at pcc? vme0 at vmepcc0 @@ -72,10 +73,6 @@ vme0 at vmepcc0 #foo0 at vme0 addr 0x10001000 am 0x0d irq 2 vect 0x80 scsibus* at wdsc? - sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? -ch* at scsibus? target ? lun ? -ss* at scsibus? target ? lun ? # SCSI scanners -uk* at scsibus? target ? lun ? # SCSI unknown diff --git a/sys/arch/mvme68k/conf/VME162 b/sys/arch/mvme68k/conf/VME162 index cea3e5bfe0c3..593e4f7131b4 100644 --- a/sys/arch/mvme68k/conf/VME162 +++ b/sys/arch/mvme68k/conf/VME162 @@ -1,4 +1,4 @@ -# $NetBSD: VME162,v 1.1 2000/09/06 19:51:43 scw Exp $ +# $NetBSD: VME162,v 1.2 2000/11/25 19:33:40 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" @@ -8,10 +8,10 @@ options MVME162 # Needed on m68040 boards to emulate some missing FP instructions options FPSP -maxusers 16 +maxusers 8 -options DDB -options DIAGNOSTIC, DEBUG +#options DDB +#options DIAGNOSTIC, DEBUG #options SYSVSHM options KTRACE @@ -21,6 +21,7 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION @@ -29,7 +30,7 @@ file-system MFS # Networking options options INET -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP @@ -76,7 +77,4 @@ scsibus* at ncrsc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? # SCSI scanners -#uk* at scsibus? target ? lun ? # SCSI unknown +cd* at scsibus? target ? lun ? diff --git a/sys/arch/mvme68k/conf/VME167 b/sys/arch/mvme68k/conf/VME167 index c4409aeb155d..37f8af530b84 100644 --- a/sys/arch/mvme68k/conf/VME167 +++ b/sys/arch/mvme68k/conf/VME167 @@ -1,4 +1,4 @@ -# $NetBSD: VME167,v 1.5 2000/03/18 22:33:02 scw Exp $ +# $NetBSD: VME167,v 1.6 2000/11/25 19:33:40 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" @@ -8,10 +8,10 @@ options MVME167 # Needed on m68040 boards to emulate some missing FP instructions options FPSP -maxusers 16 +maxusers 8 -options DDB -options DIAGNOSTIC, DEBUG +#options DDB +#options DIAGNOSTIC, DEBUG #options SYSVSHM options KTRACE @@ -21,21 +21,22 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION -options NFSSERVER +#options NFSSERVER #options FFS_EI # FFS Endian Independant support # Networking options options INET -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP #options EON -options COMPAT_14, COMPAT_13, COMPAT_12 +#options COMPAT_14, COMPAT_13, COMPAT_12 #options COMPAT_SUNOS #options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries @@ -75,7 +76,4 @@ scsibus* at ncrsc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? # SCSI scanners -#uk* at scsibus? target ? lun ? # SCSI unknown +cd* at scsibus? target ? lun ? diff --git a/sys/arch/mvme68k/conf/VME172 b/sys/arch/mvme68k/conf/VME172 index 5cb84fa2addd..6065ac2146c9 100644 --- a/sys/arch/mvme68k/conf/VME172 +++ b/sys/arch/mvme68k/conf/VME172 @@ -1,4 +1,4 @@ -# $NetBSD: VME172,v 1.1 2000/11/20 19:35:28 scw Exp $ +# $NetBSD: VME172,v 1.2 2000/11/25 19:33:40 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" @@ -7,10 +7,10 @@ options MVME172 options M060SP -maxusers 16 +maxusers 8 -options DDB -options DIAGNOSTIC, DEBUG +#options DDB +#options DIAGNOSTIC, DEBUG #options SYSVSHM options KTRACE @@ -20,6 +20,7 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION @@ -28,13 +29,13 @@ file-system MFS # Networking options options INET -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP #options EON -options COMPAT_15, COMPAT_14, COMPAT_13, COMPAT_12 +#options COMPAT_15, COMPAT_14, COMPAT_13, COMPAT_12 #options COMPAT_SUNOS #options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries @@ -75,7 +76,4 @@ scsibus* at ncrsc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? # SCSI scanners -#uk* at scsibus? target ? lun ? # SCSI unknown +cd* at scsibus? target ? lun ? diff --git a/sys/arch/mvme68k/conf/VME177 b/sys/arch/mvme68k/conf/VME177 index 324de10bd36f..c8e0659f59ef 100644 --- a/sys/arch/mvme68k/conf/VME177 +++ b/sys/arch/mvme68k/conf/VME177 @@ -1,4 +1,4 @@ -# $NetBSD: VME177,v 1.1 2000/11/20 19:35:28 scw Exp $ +# $NetBSD: VME177,v 1.2 2000/11/25 19:33:40 scw Exp $ include "arch/mvme68k/conf/std.mvme68k" @@ -7,10 +7,10 @@ options MVME177 options M060SP -maxusers 16 +maxusers 8 -options DDB -options DIAGNOSTIC, DEBUG +#options DDB +#options DIAGNOSTIC, DEBUG #options SYSVSHM options KTRACE @@ -20,21 +20,22 @@ file-system FFS file-system NFS file-system KERNFS file-system MFS +file-system CD9660 #file-system MSDOSFS #file-system UNION -options NFSSERVER +#options NFSSERVER #options FFS_EI # FFS Endian Independant support # Networking options options INET -options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP #options GATEWAY # IP packet forwarding #options ISO # OSI networking #options TPIP #options EON -options COMPAT_14, COMPAT_13, COMPAT_12 +#options COMPAT_14, COMPAT_13, COMPAT_12 #options COMPAT_SUNOS #options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries @@ -74,7 +75,4 @@ scsibus* at ncrsc? sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? -#cd* at scsibus? target ? lun ? -#ch* at scsibus? target ? lun ? -#ss* at scsibus? target ? lun ? # SCSI scanners -#uk* at scsibus? target ? lun ? # SCSI unknown +cd* at scsibus? target ? lun ?