updated but not completely tested

1 files changed, 73 insertions, 20 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