sync with NetBSD

10 files changed, 77 insertions, 59 deletions

diff --git a/sys/arch/sun3/conf/COYOTE b/sys/arch/sun3/conf/COYOTE
index 1532b65d83e..75e44ccb5db 100644
--- a/sys/arch/sun3/conf/COYOTE
+++ b/sys/arch/sun3/conf/COYOTE
@@ -1,5 +1,5 @@
 #
-# $OpenBSD: COYOTE,v 1.1 1996/11/12 00:01:47 kstailey Exp $
+# $OpenBSD: COYOTE,v 1.2 1996/11/23 07:54:46 kstailey Exp $
 #
 
 #
@@ -17,10 +17,13 @@ include "std.sun3"
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
-#makeoptions DEBUG="-g"			# symbols for kgdb + nm
+
+# Debugging options.  Uncomment either this:
 options 	DDB
+# ... or these two: (for KGDB on another machine)
+#makeoptions DEBUG="-g"			# symbols for kgdb + nm
+#options 	KGDB
 
 # Filesystem options
 options 	NFSCLIENT			# nfs client support
@@ -69,7 +72,7 @@ ms0    at zsc0 channel 1	# mouse
 #
 
 # Lance Ethernet (only onboard)
-le0 at obio0 addr ? level ?
+le0 at obio0 addr   0x120000 level 3
 
 #
 # Frame buffer devices
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index 263d7634919..70701fa8be7 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -16,7 +16,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index 52025702396..272fbfa1eaf 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -16,7 +16,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 43ddc262554..8cc69d47d87 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -16,7 +16,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
@@ -78,18 +77,28 @@ ms0    at zsc0 channel 1	# mouse
 #
 
 # Intel Ethernet (onboard, or VME)
-ie0 at obio0 addr ? level ?
+ie0 at obio0 addr   0x0C0000 level 3
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
 # Lance Ethernet (only onboard)
-le0 at obio0 addr ? level ?
+le0 at obio0 addr   0x120000 level 3
 
 #
 # Disk and tape devices
 #
 
 # Sun3 "si" SCSI controller (NCR 5380)
-si0 at obio0 addr ? level ?
+# This driver has several flags which may be enabled by OR'ing
+# the values and using the "flags" directive.  (PR#1929)
+# Valid flags are:
+#
+#	0x01		Use DMA (may be polled)
+#	0x02		Use DMA completion interrupts
+#	0x04		Allow disconnect/reselect
+#
+# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
+# Note: these values are quite a bit paranoid...
+si0 at obio0 addr   0x140000 level 2
 si0 at vmes0 addr 0xff200000 level 2 vect 0x40
 si1 at vmes0 addr 0xff204000 level 2 vect 0x41
 
diff --git a/sys/arch/sun3/conf/GENERIC_KGDB b/sys/arch/sun3/conf/GENERIC_KGDB
index 268cbcbd0de..840f2b5b9ff 100644
--- a/sys/arch/sun3/conf/GENERIC_KGDB
+++ b/sys/arch/sun3/conf/GENERIC_KGDB
@@ -16,7 +16,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index a59fd9a88d3..7c128c0a4de 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.43 1996/02/29 20:57:38 cgd Exp $
+#	$NetBSD: Makefile.sun3,v 1.51 1996/09/09 21:07:08 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -7,7 +7,7 @@
 # Most changes should be made in the machine description
 #	/sys/arch/sun3/conf/``machineid''
 # after which you should do
-#	 config machineid
+#	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/sun3/conf/Makefile.sun3
 # after which config should be rerun for all machines of that type.
@@ -21,24 +21,33 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
 
-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
-STRIP?=	strip -d
-TOUCH?=	touch -f -c
+MKDEP?=	mkdep
+STRIP?=	strip
 
 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-SUN3=	../..
-
-INCLUDES=	-I. -I$S/arch -I$S
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dsun3
-CFLAGS=		${DEBUG} -O2 -Werror -msoft-float
+.ifndef S
+S!=	cd ../../../..; pwd
+.endif
+SUN3=	$S/arch/sun3
+
+# Override CPP defaults entirely, so cross-compilation works.
+INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+XDEFS=		-undef -D__NetBSD__ -Dm68k -Dmc68000
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dsun3 ${XDEFS}
+CWARNFLAGS= 	-Werror # -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS= 	${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-N -Ttext 0E004000 -e start
+STRIPFLAGS=	-d
 
-# What to use for libkern:
+HOSTED_CC=	${CC}
+HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
+HOSTED_CFLAGS=	${CFLAGS}
+
+### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
 LIBKERN=	${KERNLIB}
@@ -54,19 +63,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
+
+HOSTED_C=	${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 
 %OBJS
 
@@ -92,7 +95,7 @@ DEBUG?=
 LINKFLAGS+=	-X
 SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} $@; ${STRIP} $@
+		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
 .else
 LINKFLAGS+=	-S
 .endif
@@ -106,14 +109,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${SUN3}/sun3/genassym.c
-	${NORMAL_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -124,11 +127,11 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 
 clean::
-	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
+	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${SUN3}/sun3/Locore.c ${CFILES} ${SUN3}/sun3/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -148,15 +151,24 @@ SRCS=	${SUN3}/sun3/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${SUN3}/sun3/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} \
+	    ${SUN3}/sun3/genassym.c
+
+# XXX - see below
+#	${MKDEP} -a ${APPFLAGS} ${SUN3}/sun3/locore.s
+#	${MKDEP} -a ${APPFLAGS} ${SFILES}
+#
+# For cross-compilation, the "gcc -M" mkdep script is convenient,
+# but that does not correctly make rules from *.s files.  The
+# easiest compromise is to just list those dependencies here.
+locore.o: assym.h machine/trap.h m68k/trap.h
+copy.o:   assym.h $S/sys/errno.h
 
 
 # depend on root or device configuration
 autoconf.o conf.o: Makefile
-
+ 
 # depend on network or filesystem configuration 
 uipc_proto.o vfs_conf.o: Makefile 
 
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index cd2cffeb47b..733c66e3601 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -17,9 +17,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	2
 
-# Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
-
 # Debugging options.  Uncomment either this:
 #options 	DDB
 # ... or these two: (for KGDB on another machine)
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index a3587672ee1..0f6eab813e7 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -16,7 +16,6 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3
index d8e9006bd90..6556ae46e84 100644
--- a/sys/arch/sun3/conf/files.sun3
+++ b/sys/arch/sun3/conf/files.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sun3,v 1.24 1996/05/07 01:30:18 thorpej Exp $
+#	$NetBSD: files.sun3,v 1.26 1996/10/29 19:58:14 gwr Exp $
 
 #
 # sun3-specific configuration info
@@ -34,7 +34,7 @@ file arch/sun3/sun3/vm_machdep.c
 
 file arch/sun3/dev/idprom.c
 
-include "../../m68k/fpe/files.fpe"
+include "arch/m68k/fpe/files.fpe"
 
 file arch/m68k/m68k/copy.s
 file dev/cons.c
@@ -137,8 +137,6 @@ device cgfour: sunfb
 attach cgfour at obmem
 file arch/sun3/dev/cg4.c		cgfour needs-flag
 
-file	arch/sun3/dev/bt_subr.c 	cgfour
-
 #
 # VME
 #
diff --git a/sys/arch/sun3/conf/std.sun3 b/sys/arch/sun3/conf/std.sun3
index 2274f33b012..5f3be8d1363 100644
--- a/sys/arch/sun3/conf/std.sun3
+++ b/sys/arch/sun3/conf/std.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: std.sun3,v 1.15.4.1 1996/08/19 23:35:12 gwr Exp $
+#	$NetBSD: std.sun3,v 1.19 1996/11/19 21:04:50 gwr Exp $
 
 # Standard information for sun3's.
 machine	sun3 m68k
@@ -18,14 +18,17 @@ vmel0 at mainbus?
 # Devices that should be present in any Sun3 kernel.
 
 # OBIO
-zsc0 at obio? addr ?
-zsc1 at obio? addr ?
-eeprom0 at obio? addr ?
-clock0 at obio? addr ?
-memerr0 at obio? addr ?
-intreg0 at obio? addr ?
+zsc0    at obio0 addr 0x000000
+zsc1    at obio0 addr 0x020000
+eeprom0 at obio0 addr 0x040000
+clock0  at obio0 addr 0x060000
+memerr0 at obio0 addr 0x080000
+intreg0 at obio0 addr 0x0A0000
 
 # Standard defines
+options		EXEC_AOUT
+options		EXEC_SCRIPT
+options 	SWAPPAGER, VNODEPAGER, DEVPAGER
 
 # XXX - Still needed?
 options 	NEWCONFIG