summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc/conf/FLOPPY93
-rw-r--r--sys/arch/sparc/conf/GENERIC12
-rw-r--r--sys/arch/sparc/conf/GENERIC_SCSI316
-rw-r--r--sys/arch/sparc/conf/SUN492
-rw-r--r--sys/arch/sparc/conf/SUN4C95
-rw-r--r--sys/arch/sparc/conf/SUN4M97
-rw-r--r--sys/arch/sparc/conf/TDR102
7 files changed, 327 insertions, 180 deletions
diff --git a/sys/arch/sparc/conf/FLOPPY b/sys/arch/sparc/conf/FLOPPY
index 8dd47a73f1f..4c31033d128 100644
--- a/sys/arch/sparc/conf/FLOPPY
+++ b/sys/arch/sparc/conf/FLOPPY
@@ -1,38 +1,40 @@
-# $NetBSD: SUN4C,v 1.2 1995/01/25 05:35:11 cgd Exp $
-
-# Kernel for Theo's wimpy sparcstation IPC
+# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
+# XXX should get rid of a bunch of things
machine sparc
-options SUN4C
+options SUN4C, SUN4M
+options MMU_3L
+#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
options TIMEZONE=0, DST=0
# Standard system options
-options MACHINE_NONCONTIG
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
#options DEBUG, DIAGNOSTIC # extra kernel debugging
-#options KTRACE # system call tracing support
+options KTRACE # system call tracing support
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options RCONSOLE # fast rasterop console
-#options SYSVMSG,SYSVSEM,SYSVSHM
+options RASTERCONSOLE # fast rasterop console
+options SYSVMSG,SYSVSEM,SYSVSHM
options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
-#options MSDOSFS # MS-DOS filesystem
-#options NFSSERVER # Sun NFS-compatible filesystem
+options NFSSERVER # Sun NFS-compatible filesystem
options NFSCLIENT # Sun NFS-compatible filesystem
-#options KERNFS # kernel data-structure filesystem
-#options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # fast filesystem with user and group quotas
-#options MFS # memory-based filesystem
-#options LOFS # Loop-back 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 KERNFS # kernel data-structure filesystem
+options FIFO # POSIX fifo support (in all filesystems)
+options QUOTA # fast filesystem with user and group quotas
+options MFS # memory-based filesystem
+options LOFS # Loop-back 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 # /proc
+options CD9660 # ISO 9660 + Rock Ridge file system
+options UNION # union file system
# Networking options
options INET
@@ -47,6 +49,7 @@ options LKM
# Options for SPARCstation hardware
options COMPAT_SUNOS # compatibility with SunOS binaries
+options COMPAT_SVR4 # compatibility with SVR4 binaries
config netbsd swap generic
@@ -54,15 +57,31 @@ mainbus0 at root
cpu0 at mainbus0
sbus0 at mainbus0
+#obio0 at mainbus0
+#vmes0 at mainbus0
+#vmel0 at mainbus0
audio0 at mainbus0
auxreg0 at mainbus0
clock0 at mainbus0
+#clock0 at obio0 addr 0xf2000000
+#oclock0 at obio0 addr 0xf3000000
+#oclock0 at obio0 addr 0x03000000 # 4/100
memreg0 at mainbus0
+#memreg0 at obio0 addr 0xf4000000
+#memreg0 at obio0 addr 0x04000000 # 4/100
timer0 at mainbus0
+#timer0 at obio0 addr 0xef000000
+#eeprom0 at obio0 addr 0xf2000000
+#eeprom0 at obio0 addr 0x02000000 # 4/100
zs0 at mainbus0
+#zs0 at obio0 addr 0xf1000000 level 12 flags 0x103
+#zs0 at obio0 addr 0x01000000 level 12 flags 0x103 # 4/100
zs1 at mainbus0
+#zs1 at obio0 addr 0xf0000000 level 12 flags 0x103
+#zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # 4/100
+#zs2 at obio0 addr 0xe0000000 level 12 flags 0x103
# FSBE/S or sun4m
espdma0 at sbus0 slot ? offset ?
@@ -73,21 +92,55 @@ esp* at espdma? slot ? offset ?
# old sun4c SCSI
dma0 at sbus0 slot ? offset ?
dma* at sbus0 slot ? offset ?
+#dma0 at obio0 addr 0xfa001000 level 4
esp0 at sbus0 slot ? offset ?
esp* at sbus0 slot ? offset ?
+#esp0 at obio0 addr 0xfa000000 level 4
# old sun4c
le0 at sbus? slot ? offset ?
le* at sbus? slot ? offset ?
+#le0 at obio0 addr 0xf9000000 level 6
+
+#ie0 at obio0 addr 0xf6000000 level 6
+#ie0 at obio0 addr 0x06000000 level 6 # 4/100
+#ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75
+#ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76
+#ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77
+#ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c
+
+#xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44
+#xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45
+#xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46
+#xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47
+#xd* at xdc? drive ?
+
+#xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48
+#xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49
+#xy* at xyc? drive ?
+
+#si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+#sw0 at obio0 addr 0x0a000000 level 2
bwtwo0 at sbus? slot ? offset ?
bwtwo* at sbus? slot ? offset ?
+#bwtwo0 at obio0 addr 0xfd000000 level 4 # 4/260
+#bwtwo0 at obio0 addr 0xfb300000 level 4 # 4/{300/400} ??
+#cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8
cgthree0 at sbus? slot ? offset ?
cgthree* at sbus? slot ? offset ?
cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+#pfour0 at obio0 addr 0xfb000000
+#pfour0 at obio0 addr 0x0b000000 # 4/100
+#cgfour0 at pfour0
+#cgeight0 at pfour0
+#cgsix0 at pfour0
+
scsibus* at esp?
+#scsibus* at si?
+#scsibus* at sw?
sd* at scsibus? target ? lun ?
st* at scsibus? target ? lun ?
@@ -101,6 +154,6 @@ pseudo-device pty 32
pseudo-device sl 2
pseudo-device kbd
pseudo-device ppp 2
-#pseudo-device tun 4
+pseudo-device tun 4
pseudo-device vnd 3
pseudo-device bpfilter 16
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 1dd2e692cf6..588dd24f316 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,8 +1,8 @@
# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
machine sparc
-options "SUN4", "SUN4C"
-#options MMU_3L
+options SUN4, SUN4C, SUN4M
+options MMU_3L
#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
@@ -16,7 +16,7 @@ options KTRACE # system call tracing support
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
options RASTERCONSOLE # fast rasterop console
options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
+options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
@@ -131,6 +131,12 @@ cgthree* at sbus? slot ? offset ?
cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+pfour0 at obio0 addr 0xfb000000
+pfour0 at obio0 addr 0x0b000000 # 4/100
+cgfour0 at pfour0
+cgeight0 at pfour0
+cgsix0 at pfour0
+
scsibus* at esp?
scsibus* at si?
scsibus* at sw?
diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index cdc0c032fad..98675194c12 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -1,8 +1,8 @@
-# $NetBSD: GENERIC_SCSI3,v 1.19 1995/10/08 11:45:40 pk Exp $
+# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
machine sparc
-options "SUN4", "SUN4C"
-#options MMU_3L
+options SUN4, SUN4C, SUN4M
+options MMU_3L
#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
@@ -16,7 +16,7 @@ options KTRACE # system call tracing support
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
options RASTERCONSOLE # fast rasterop console
options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
+options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
@@ -131,11 +131,17 @@ cgthree* at sbus? slot ? offset ?
cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+pfour0 at obio0 addr 0xfb000000
+pfour0 at obio0 addr 0x0b000000 # 4/100
+cgfour0 at pfour0
+cgeight0 at pfour0
+cgsix0 at pfour0
+
scsibus* at esp?
scsibus* at si?
scsibus* at sw?
-# Map scsi-id 3 to sd0; no questions asked. Map the remaining drives
+# Map scsi-id 3 to sd0; no questions asked. Map the remaining drives
# in the default order. This is because SunOS's rom swaps scsi-id 3 to
# sd0, and scsi-id 0 to sd3.
sd0 at scsibus? target 3 lun ?
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index 5029257292e..d572fdd6503 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,7 +1,9 @@
-# $NetBSD: SUN4,v 1.12 1995/06/02 17:53:57 pk Exp $
+# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
machine sparc
-options "SUN4"
+options SUN4
+options MMU_3L
+#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
options TIMEZONE=0, DST=0
@@ -12,25 +14,26 @@ options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options RCONSOLE # fast rasterop console
+options RASTERCONSOLE # fast rasterop console
options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
+options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
options NFSSERVER # Sun NFS-compatible filesystem
options NFSCLIENT # Sun NFS-compatible filesystem
-#options KERNFS # kernel data-structure filesystem
-#options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # fast filesystem with user and group quotas
-#options MFS # memory-based filesystem
-#options LOFS # Loop-back 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 # /proc
-#options CD9660 # ISO 9660 + Rock Ridge file system
+options KERNFS # kernel data-structure filesystem
+options FIFO # POSIX fifo support (in all filesystems)
+options QUOTA # fast filesystem with user and group quotas
+options MFS # memory-based filesystem
+options LOFS # Loop-back 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 # /proc
+options CD9660 # ISO 9660 + Rock Ridge file system
+options UNION # union file system
# Networking options
options INET
@@ -45,32 +48,57 @@ options LKM
# Options for SPARCstation hardware
options COMPAT_SUNOS # compatibility with SunOS binaries
+options COMPAT_SVR4 # compatibility with SVR4 binaries
config netbsd swap generic
mainbus0 at root
cpu0 at mainbus0
+#sbus0 at mainbus0
obio0 at mainbus0
vmes0 at mainbus0
vmel0 at mainbus0
+#audio0 at mainbus0
+#auxreg0 at mainbus0
+#clock0 at mainbus0
clock0 at obio0 addr 0xf2000000
oclock0 at obio0 addr 0xf3000000
oclock0 at obio0 addr 0x03000000 # 4/100
+#memreg0 at mainbus0
memreg0 at obio0 addr 0xf4000000
memreg0 at obio0 addr 0x04000000 # 4/100
+#timer0 at mainbus0
timer0 at obio0 addr 0xef000000
+eeprom0 at obio0 addr 0xf2000000
+eeprom0 at obio0 addr 0x02000000 # 4/100
+#zs0 at mainbus0
zs0 at obio0 addr 0xf1000000 level 12 flags 0x103
zs0 at obio0 addr 0x01000000 level 12 flags 0x103 # 4/100
+#zs1 at mainbus0
zs1 at obio0 addr 0xf0000000 level 12 flags 0x103
zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # 4/100
zs2 at obio0 addr 0xe0000000 level 12 flags 0x103
+# FSBE/S or sun4m
+#espdma0 at sbus0 slot ? offset ?
+#espdma* at sbus0 slot ? offset ?
+#esp0 at espdma? slot ? offset ?
+#esp* at espdma? slot ? offset ?
+
+# old sun4c SCSI
+#dma0 at sbus0 slot ? offset ?
+#dma* at sbus0 slot ? offset ?
dma0 at obio0 addr 0xfa001000 level 4
+#esp0 at sbus0 slot ? offset ?
+#esp* at sbus0 slot ? offset ?
esp0 at obio0 addr 0xfa000000 level 4
+# old sun4c
+#le0 at sbus? slot ? offset ?
+#le* at sbus? slot ? offset ?
le0 at obio0 addr 0xf9000000 level 6
ie0 at obio0 addr 0xf6000000 level 6
@@ -80,12 +108,46 @@ ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76
ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77
ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c
+xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44
+xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45
+xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46
+xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47
+xd* at xdc? drive ?
+
+xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48
+xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49
+xy* at xyc? drive ?
+
+si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+sw0 at obio0 addr 0x0a000000 level 2
+
+#bwtwo0 at sbus? slot ? offset ?
+#bwtwo* at sbus? slot ? offset ?
+bwtwo0 at obio0 addr 0xfd000000 level 4 # 4/260
+bwtwo0 at obio0 addr 0xfb300000 level 4 # 4/{300/400} ??
+cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8
+#cgthree0 at sbus? slot ? offset ?
+#cgthree* at sbus? slot ? offset ?
+#cgsix0 at sbus? slot ? offset ?
+#cgsix* at sbus? slot ? offset ?
+
+pfour0 at obio0 addr 0xfb000000
+pfour0 at obio0 addr 0x0b000000 # 4/100
+cgfour0 at pfour0
+cgeight0 at pfour0
+cgsix0 at pfour0
+
scsibus* at esp?
+scsibus* at si?
+scsibus* at sw?
sd* at scsibus? target ? lun ?
st* at scsibus? target ? lun ?
cd* at scsibus? target ? lun ?
+#fdc0 at mainbus0
+#fd* at fdc0
+
pseudo-device loop
pseudo-device pty 32
pseudo-device sl 2
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 34b08562974..f4715780239 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,9 +1,9 @@
-# $NetBSD: SUN4C,v 1.3 1995/06/02 17:53:59 pk Exp $
-
-# Kernel for Theo's wimpy sparcstation IPC
+# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
machine sparc
-options "SUN4C"
+options SUN4C
+#options MMU_3L
+#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
options TIMEZONE=0, DST=0
@@ -14,23 +14,26 @@ options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options RCONSOLE # fast rasterop console
+options RASTERCONSOLE # fast rasterop console
options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
+options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
options NFSSERVER # Sun NFS-compatible filesystem
options NFSCLIENT # Sun NFS-compatible filesystem
options KERNFS # kernel data-structure filesystem
-#options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # fast filesystem with user and group quotas
-#options MFS # memory-based filesystem
-#options LOFS # Loop-back 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 FIFO # POSIX fifo support (in all filesystems)
+options QUOTA # fast filesystem with user and group quotas
+options MFS # memory-based filesystem
+options LOFS # Loop-back 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 # /proc
+options CD9660 # ISO 9660 + Rock Ridge file system
+options UNION # union file system
# Networking options
options INET
@@ -45,52 +48,106 @@ options LKM
# Options for SPARCstation hardware
options COMPAT_SUNOS # compatibility with SunOS binaries
+options COMPAT_SVR4 # compatibility with SVR4 binaries
-config netbsd root on sd0 swap on sd0
+config netbsd swap generic
mainbus0 at root
cpu0 at mainbus0
sbus0 at mainbus0
+obio0 at mainbus0
+vmes0 at mainbus0
+vmel0 at mainbus0
audio0 at mainbus0
auxreg0 at mainbus0
clock0 at mainbus0
+#clock0 at obio0 addr 0xf2000000
+#oclock0 at obio0 addr 0xf3000000
+#oclock0 at obio0 addr 0x03000000 # 4/100
memreg0 at mainbus0
+#memreg0 at obio0 addr 0xf4000000
+#memreg0 at obio0 addr 0x04000000 # 4/100
timer0 at mainbus0
+#timer0 at obio0 addr 0xef000000
+#eeprom0 at obio0 addr 0xf2000000
+#eeprom0 at obio0 addr 0x02000000 # 4/100
zs0 at mainbus0
+#zs0 at obio0 addr 0xf1000000 level 12 flags 0x103
+#zs0 at obio0 addr 0x01000000 level 12 flags 0x103 # 4/100
zs1 at mainbus0
+#zs1 at obio0 addr 0xf0000000 level 12 flags 0x103
+#zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # 4/100
+#zs2 at obio0 addr 0xe0000000 level 12 flags 0x103
# FSBE/S or sun4m
-espdma0 at sbus0 slot ? offset ?
-espdma* at sbus0 slot ? offset ?
-esp0 at espdma? slot ? offset ?
-esp* at espdma? slot ? offset ?
+#espdma0 at sbus0 slot ? offset ?
+#espdma* at sbus0 slot ? offset ?
+#esp0 at espdma? slot ? offset ?
+#esp* at espdma? slot ? offset ?
# old sun4c SCSI
dma0 at sbus0 slot ? offset ?
dma* at sbus0 slot ? offset ?
+#dma0 at obio0 addr 0xfa001000 level 4
esp0 at sbus0 slot ? offset ?
esp* at sbus0 slot ? offset ?
+#esp0 at obio0 addr 0xfa000000 level 4
# old sun4c
le0 at sbus? slot ? offset ?
le* at sbus? slot ? offset ?
+#le0 at obio0 addr 0xf9000000 level 6
+
+#ie0 at obio0 addr 0xf6000000 level 6
+#ie0 at obio0 addr 0x06000000 level 6 # 4/100
+#ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75
+#ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76
+#ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77
+#ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c
+
+#xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44
+#xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45
+#xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46
+#xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47
+#xd* at xdc? drive ?
+
+#xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48
+#xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49
+#xy* at xyc? drive ?
+
+#si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+#sw0 at obio0 addr 0x0a000000 level 2
bwtwo0 at sbus? slot ? offset ?
bwtwo* at sbus? slot ? offset ?
+#bwtwo0 at obio0 addr 0xfd000000 level 4 # 4/260
+#bwtwo0 at obio0 addr 0xfb300000 level 4 # 4/{300/400} ??
+#cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8
cgthree0 at sbus? slot ? offset ?
cgthree* at sbus? slot ? offset ?
cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+#pfour0 at obio0 addr 0xfb000000
+#pfour0 at obio0 addr 0x0b000000 # 4/100
+#cgfour0 at pfour0
+#cgeight0 at pfour0
+#cgsix0 at pfour0
+
scsibus* at esp?
+#scsibus* at si?
+#scsibus* at sw?
sd* at scsibus? target ? lun ?
st* at scsibus? target ? lun ?
cd* at scsibus? target ? lun ?
+fdc0 at mainbus0
+fd* at fdc0
+
pseudo-device loop
pseudo-device pty 32
pseudo-device sl 2
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index dcd654f1ff4..98fd8b9680d 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,34 +1,39 @@
-# $NetBSD: SUN4M,v 1.4 1995/06/02 17:54:02 pk Exp $
+# $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
machine sparc
-options "SUN4M"
+options SUN4M
+options MMU_3L
+#options DDB,DEBUG,DIAGNOSTIC
# obsolete timezone spec
options TIMEZONE=0, DST=0
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
-options DEBUG, DIAGNOSTIC # extra kernel debugging
+#options DEBUG, DIAGNOSTIC # extra kernel debugging
options KTRACE # system call tracing support
#options KGDB # support for kernel gdb
#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options RCONSOLE # fast rasterop console
+options RASTERCONSOLE # fast rasterop console
options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
+options COMPAT_09, COMPAT_10
# Filesystem options
options FFS
options NFSSERVER # Sun NFS-compatible filesystem
options NFSCLIENT # Sun NFS-compatible filesystem
-#options KERNFS # kernel data-structure filesystem
-#options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # fast filesystem with user and group quotas
-#options MFS # memory-based filesystem
-#options LOFS # Loop-back 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 KERNFS # kernel data-structure filesystem
+options FIFO # POSIX fifo support (in all filesystems)
+options QUOTA # fast filesystem with user and group quotas
+options MFS # memory-based filesystem
+options LOFS # Loop-back 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 # /proc
+options CD9660 # ISO 9660 + Rock Ridge file system
+options UNION # union file system
# Networking options
options INET
@@ -43,22 +48,39 @@ options LKM
# Options for SPARCstation hardware
options COMPAT_SUNOS # compatibility with SunOS binaries
+options COMPAT_SVR4 # compatibility with SVR4 binaries
-config netbsd root on sd0 swap on sd0
+config netbsd swap generic
mainbus0 at root
cpu0 at mainbus0
sbus0 at mainbus0
+#obio0 at mainbus0
+#vmes0 at mainbus0
+#vmel0 at mainbus0
audio0 at mainbus0
auxreg0 at mainbus0
clock0 at mainbus0
+#clock0 at obio0 addr 0xf2000000
+#oclock0 at obio0 addr 0xf3000000
+#oclock0 at obio0 addr 0x03000000 # 4/100
memreg0 at mainbus0
+#memreg0 at obio0 addr 0xf4000000
+#memreg0 at obio0 addr 0x04000000 # 4/100
timer0 at mainbus0
+#timer0 at obio0 addr 0xef000000
+#eeprom0 at obio0 addr 0xf2000000
+#eeprom0 at obio0 addr 0x02000000 # 4/100
zs0 at mainbus0
+#zs0 at obio0 addr 0xf1000000 level 12 flags 0x103
+#zs0 at obio0 addr 0x01000000 level 12 flags 0x103 # 4/100
zs1 at mainbus0
+#zs1 at obio0 addr 0xf0000000 level 12 flags 0x103
+#zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # 4/100
+#zs2 at obio0 addr 0xe0000000 level 12 flags 0x103
# FSBE/S or sun4m
espdma0 at sbus0 slot ? offset ?
@@ -66,23 +88,66 @@ espdma* at sbus0 slot ? offset ?
esp0 at espdma? slot ? offset ?
esp* at espdma? slot ? offset ?
+# old sun4c SCSI
+#dma0 at sbus0 slot ? offset ?
+#dma* at sbus0 slot ? offset ?
+#dma0 at obio0 addr 0xfa001000 level 4
+#esp0 at sbus0 slot ? offset ?
+#esp* at sbus0 slot ? offset ?
+#esp0 at obio0 addr 0xfa000000 level 4
+
+# old sun4c
le0 at sbus? slot ? offset ?
le* at sbus? slot ? offset ?
+#le0 at obio0 addr 0xf9000000 level 6
+
+#ie0 at obio0 addr 0xf6000000 level 6
+#ie0 at obio0 addr 0x06000000 level 6 # 4/100
+#ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75
+#ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76
+#ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77
+#ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c
+
+#xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44
+#xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45
+#xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46
+#xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47
+#xd* at xdc? drive ?
+
+#xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48
+#xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49
+#xy* at xyc? drive ?
+
+#si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+#sw0 at obio0 addr 0x0a000000 level 2
bwtwo0 at sbus? slot ? offset ?
bwtwo* at sbus? slot ? offset ?
+#bwtwo0 at obio0 addr 0xfd000000 level 4 # 4/260
+#bwtwo0 at obio0 addr 0xfb300000 level 4 # 4/{300/400} ??
+#cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8
cgthree0 at sbus? slot ? offset ?
cgthree* at sbus? slot ? offset ?
cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+#pfour0 at obio0 addr 0xfb000000
+#pfour0 at obio0 addr 0x0b000000 # 4/100
+#cgfour0 at pfour0
+#cgeight0 at pfour0
+#cgsix0 at pfour0
+
scsibus* at esp?
+#scsibus* at si?
+#scsibus* at sw?
-# drives here, drives there...
sd* at scsibus? target ? lun ?
st* at scsibus? target ? lun ?
cd* at scsibus? target ? lun ?
+fdc0 at mainbus0
+fd* at fdc0
+
pseudo-device loop
pseudo-device pty 32
pseudo-device sl 2
diff --git a/sys/arch/sparc/conf/TDR b/sys/arch/sparc/conf/TDR
deleted file mode 100644
index e6b2ca0f0ac..00000000000
--- a/sys/arch/sparc/conf/TDR
+++ /dev/null
@@ -1,102 +0,0 @@
-# $NetBSD: TDR,v 1.24 1995/06/02 17:54:04 pk Exp $
-
-# Kernel for Theo's wimpy sparcstation IPC
-
-machine sparc
-options "SUN4C"
-
-# obsolete timezone spec
-options TIMEZONE=0, DST=0
-
-# Standard system options
-options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
-#options DEBUG, DIAGNOSTIC # extra kernel debugging
-options KTRACE # system call tracing support
-#options KGDB # support for kernel gdb
-#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options RCONSOLE # fast rasterop console
-options SYSVMSG,SYSVSEM,SYSVSHM
-options "COMPAT_09", "COMPAT_10"
-
-# Filesystem options
-options FFS
-options NFSSERVER # Sun NFS-compatible filesystem
-options NFSCLIENT # Sun NFS-compatible filesystem
-options KERNFS # kernel data-structure filesystem
-#options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # fast filesystem with user and group quotas
-#options MFS # memory-based filesystem
-#options LOFS # Loop-back 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)
-
-# 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 COMPAT_43
-
-options LKM
-
-# Options for SPARCstation hardware
-options COMPAT_SUNOS # compatibility with SunOS binaries
-
-config netbsd root on sd0 swap on sd0
-
-mainbus0 at root
-cpu0 at mainbus0
-
-sbus0 at mainbus0
-
-audio0 at mainbus0
-auxreg0 at mainbus0
-clock0 at mainbus0
-memreg0 at mainbus0
-timer0 at mainbus0
-
-zs0 at mainbus0
-zs1 at mainbus0
-
-# FSBE/S or sun4m
-espdma0 at sbus0 slot ? offset ?
-espdma* at sbus0 slot ? offset ?
-esp0 at espdma? slot ? offset ?
-esp* at espdma? slot ? offset ?
-
-# old sun4c SCSI
-dma0 at sbus0 slot ? offset ?
-dma* at sbus0 slot ? offset ?
-esp0 at sbus0 slot ? offset ?
-esp* at sbus0 slot ? offset ?
-
-# old sun4c
-le0 at sbus? slot ? offset ?
-le* at sbus? slot ? offset ?
-
-bwtwo0 at sbus? slot ? offset ?
-bwtwo* at sbus? slot ? offset ?
-cgthree0 at sbus? slot ? offset ?
-cgthree* at sbus? slot ? offset ?
-cgsix0 at sbus? slot ? offset ?
-cgsix* at sbus? slot ? offset ?
-
-scsibus* at esp?
-
-# drives here, drives there...
-sd* at scsibus? target ? lun ?
-st* at scsibus? target ? lun ?
-cd* at scsibus? target ? lun ?
-
-pseudo-device loop
-pseudo-device pty 32
-pseudo-device sl 2
-pseudo-device kbd
-pseudo-device ppp 2
-pseudo-device tun 4
-pseudo-device vnd 3
-pseudo-device bpfilter 16