Sync to NetBSD 970110

10 files changed, 79 insertions, 388 deletions

diff --git a/sys/arch/amiga/conf/A3000 b/sys/arch/amiga/conf/A3000
deleted file mode 100644
index c08c6ebe2a3..00000000000
--- a/sys/arch/amiga/conf/A3000
+++ /dev/null
@@ -1,109 +0,0 @@
-#	$OpenBSD: A3000,v 1.6 1996/12/11 23:06:32 niklas Exp $
-#	$NetBSD: A3000,v 1.7 1994/10/26 02:02:23 cgd Exp $
-
-#
-# Minimal AMIGA 3000
-#
-# Author: Stephen Roznowski (sjr@zombie.ncsc.mil)
-#
-# This configuration file is for a multiple disk/multiple tape A3000.
-#
-
-include "arch/amiga/conf/std.amiga"
-#
-# Add support for about 16 users. This variable is used to size
-# various kernel structures.
-#
-maxusers	16
-
-#
-# processors this kernel should support
-#
-options		"M68030"	# support for 030
-
-options		TIMEZONE=300	# Set the timezone that the kernel will use
-options		DST=1		# Set the timezone that the kernel will use
-
-options		FPCOPROC	# Support for MC68881/MC68882
-options		FPSP
-
-#
-# Networking options
-#
-options		INET		# Basic networking support
-
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		PROCFS		# Process filesystem
-options		KERNFS		# Kernel parameter filesystem
-options		NULLFS		# Loopback filesystem
-
-options		FIFO		# FIFO operations on vnodes
-
-options		SWAPPAGER	# Pager for swap device
-options		DEVPAGER	# Pager
-
-#
-# Compatability options for various existing systems
-#
-options		"COMPAT_09"	# fs type binary compatability (name vs number)
-options		COMPAT_SUNOS	# Support to run Sun-3 executables
-options		"COMPAT_43"	# 4.3 BSD compatible system calls
-#options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
-options		"COMPAT_NOMID"	# ???
-
-#
-# Graphics options
-# 
-options		GRF_ECS			# Enhanced Chip Set
-options		GRF_NTSC		# NTSC
-options		GRF_PAL			# PAL
-options		"GRF_A2024"		# Support for the A2024
-
-#
-# Support for System V IPC facilities.
-#
-options		SYSVSHM		# System V shared memory
-options		SYSVMSG		# System V messages
-options		SYSVSEM		# System V semaphores
-
-#
-# Support for various kernel options
-#
-options		KTRACE		# Add kernel tracing system call
-options		DIAGNOSTIC	# Add additional error checking code
-options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
-options		GENERIC		# Mini-root boot support
-
-#
-# Build one kernel that can boot from any disk.
-#
-config		bsd swap on generic
-
-pseudo-device	view	10	# View (graphics mapping)
-pseudo-device	pty	16	# Pseudo-tty support
-pseudo-device	loop		# Loopback network
-
-#
-#The following sections describe various hardware options.
-#
-
-#
-# Devices on an Amiga 3000
-#
-ahsc0		at mainbus0		# A3000 scsi
-scsibus0	at ahsc0
-
-# any drives on configured controllers.
-sd0	at scsibus? target 0 lun 0
-sd1	at scsibus? target 1 lun 0
-sd2	at scsibus? target 2 lun 0
-sd3	at scsibus? target 3 lun 0
-sd4	at scsibus? target 4 lun 0
-sd5	at scsibus? target 5 lun 0
-sd6	at scsibus? target 6 lun 0
-st0	at scsibus? target ? lun 0
-
-grfcc0		at mainbus0
-grf0		at grfcc0
-ite0		at grf0
diff --git a/sys/arch/amiga/conf/COFFEE b/sys/arch/amiga/conf/COFFEE
deleted file mode 100644
index e023c49511f..00000000000
--- a/sys/arch/amiga/conf/COFFEE
+++ /dev/null
@@ -1,224 +0,0 @@
-#	$OpenBSD: COFFEE,v 1.7 1996/12/11 23:06:33 niklas Exp $
-#	$NetBSD: COFFEE,v 1.12 1995/10/09 02:08:35 chopps Exp $
-
-#
-# COFFEE - GENERIC but with GATEWAY and DEBUG
-#
-# This configuration file contains all possible options
-#
-
-include "arch/amiga/conf/std.amiga"
-
-maxusers	8
-option		TIMEZONE=300, DST=1
-
-#
-# processors this kernel should support
-#
-option		"M68040"	# support for 040
-option		FPSP		# MC68040 floating point support
-option		"M68030"	# support for 030
-option		"M68020"	# support for 020/851
-option		FPCOPROC	# Support for MC6888[12] (Required)
-
-option		SWAPPAGER	# Pager for processes (Required)
-option		DEVPAGER	# Pager for devices (Required)
-
-#
-# Networking options
-#
-option		INET		# IP networking support (Required)
-#option		ISO		# ISO Networking support
-#option		TPIP		# ARGO TP networking support
-#option		CCITT		# CCITT X.25
-#option		NS		# Xerox XNS
-#option		EON		# ISO CLNL over IP
-option		GATEWAY		# Packet forwarding
-#option		DIRECTED_BROADCAST	# Broadcast across subnets
-#option		NSIP		# XNS over IP
-
-#
-# File system related options
-#
-option		QUOTA		# Disk quotas for local disks
-option		NFSSERVER	# Network File System server side code
-option		NFSCLIENT	# Network File System client side code
-
-#
-# File systems
-#
-option		FFS		# Berkeley fast file system
-option		MFS		# Memory based filesystem
-option		PROCFS		# Process filesystem
-option		KERNFS		# Kernel parameter filesystem (Recommended)
-option		FDESC		# /dev/fd filesystem
-option		NULLFS		# Loopback filesystem
-option		FIFO		# FIFO operations on vnodes (Recommended)
-option		ADOSFS		# AmigaDOS file system
-option		"CD9660"	# ISO 9660 file system, with Rock Ridge
-option		UNION		# union file system
-option		UMAPFS		# uid/gid remapping filesystem
-#option		PORTAL		# Portal filesystem
-#option		MSDOSFS		# MS-DOS filesystem
-
-
-#
-# Compatability options for various existing systems
-#
-option		"COMPAT_10"	# compatability with older NetBSD release
-option		"COMPAT_09"	# compatability with older NetBSD release
-option		"COMPAT_43"	# 4.3 BSD compatible system calls
-option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
-#option		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
-option		"COMPAT_NOMID"	# allow nonvalid machine id executables
-#option		COMPAT_HPUX	# HP300 compatability
-
-#
-# Support for System V IPC facilities.
-#
-option		SYSVSHM		# System V-like shared memory
-option		SYSVMSG		# System V-like messages
-option		SYSVSEM		# System V-like semaphores
-
-#
-# Support for various kernel options
-#
-option		GENERIC		# Mini-root boot support
-option		LKM		# Loadable kernel modules
-option		KTRACE		# Add kernel tracing system call
-option		DIAGNOSTIC	# Add additional error checking code
-option		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
-
-#
-# Misc. debuging options
-#
-option		PANICWAIT	# Require keystroke to dump/reboot
-option		DEBUG		# Add debugging statements
-option		DDB		# Kernel debugger
-#option		SYSCALL_DEBUG	# debug all syscalls.
-#option		SCSIDEBUG	# Add SCSI debugging statements
-#option		KGDB		# Kernel debugger (KGDB) support
-#option		PANICBUTTON	# Forced crash via keypress (???)
-
-#
-# Amiga specific options
-#
-option		MACHINE_NONCONTIG # Non-contiguous memory support
-
-option		RETINACONSOLE	# enable code to allow retina to be console
-option		ULOWELLCONSOLE	# enable code to allow a2410 to be console
-option		CL5426CONSOLE   # Cirrus console
-
-option		GRF_ECS		# Enhanced Chip Set
-option		GRF_NTSC	# NTSC
-option		GRF_PAL		# PAL
-option		"GRF_A2024"	# Support for the A2024
-option		GRF_AGA		# AGA Chip Set
-option		GRF_CL5426	# Cirrus board support
-#option		"KFONT_8X11"	# 8x11 font
-
-# This is how you would tell the kernel the A2410 oscillator frequencies:
-# The used frequencies are the defaults, and don't need option setting
-#option		"ULOWELL_OSC1=36000000"
-#option		"ULOWELL_OSC2=66667000"
-
-# This is how you specify the blitting speed, higher values may speed up blits
-# a littel bit.  If you raise this value too much some trash may appear.
-# the commented version is the default.
-#option		RH_MEMCLK 61000000
-# this option enables the 64 bit sprite which doesn't seems to be work
-# for quite a few people.  E.g. The cursor sprite will turn to a block
-# when moved to the top of the screen in X.
-#option		RH_64BIT_SPRITE
-# enables fast scroll code appears to now work on 040 systems.
-#option		RETINA_SPEED_HACK
-
-grfcc0		at mainbus0		# custom chips
-grfrt0		at zbus0		# retina II
-grfrh0		at zbus0		# retina III
-grfcl*		at zbus0		# Picasso II/Piccalo/Spectrum
-grful0		at zbus0		# A2410
-grfcv0		at zbus0		# CyberVision 64
-
-grf0		at grfcc0
-grf1		at grfrt0
-grf2		at grfrh0
-grf3		at grfcl?
-grf4		at grful0
-grf5		at grfcv0
-
-ite0		at grf0			# terminal emulators for grf's
-ite1		at grf1			# terminal emulators for grf's
-ite2		at grf2			# terminal emulators for grf's
-ite3		at grf3			# terminal emulators for grf's
-ite4		at grf4			# terminal emulators for grf's
-
-msc0		at zbus0		# A2232 MSC multiport serial.
-mfc0		at zbus0		# MultiFaceCard I/O board
-mfcs0		at mfc0 unit 0		# MFC serial
-mfcs1		at mfc0 unit 1		# MFC serial
-#mfcp0		at mfc0 unit 0		# MFC parallel [not available yet]
-#mfc1		at zbus0		# MultiFaceCard 2nd I/O board
-#mfcs2		at mfc1 unit 0
-#mfcs3		at mfc1 unit 1
-#mfcp1		at mfc1 unit 0
-
-le0		at zbus0		# Lance ethernet.
-ed0		at zbus0		# dp8390 ethernet
-es0		at zbus0		# SMC 91C90 ethernet
-qn0		at zbus0		# quicknet ethernet
-ae0		at zbus0		# Ariadne ethernet
-bah0		at zbus0		# C= arcnet
-
-# scsi stuff, all possible
-gvpbus*		at zbus0
-gtsc0		at gvpbus?		# GVP series II scsi
-ahsc0		at mainbus0		# A3000 scsi
-atzsc0		at zbus0
-wstsc0		at zbus0		# Wordsync II scsi
-ivsc0		at zbus0		# IVS scsi
-mlhsc0		at zbus0		# Hacker scsi
-otgsc0		at zbus0		# 12 gauge scsi
-zssc0		at zbus0		# Zeus scsi
-mgnsc0		at zbus0		# Magnum scsi
-wesc0		at zbus0		# Warp Engine scsi
-idesc0		at mainbus0		# A4000 & A1200 IDE
-afsc0		at zbus0		# A4091 scsi
-aftsc0		at mainbus0		# A4000T scsi
-flsc0		at zbus0		# FastlaneZ3 scsi
-bzsc0		at zbus0		# Blizzard 1230 scsi
-
-scsibus*	at gtsc0
-scsibus*	at ahsc0
-scsibus*	at atzsc0
-scsibus*	at wstsc0
-scsibus*	at ivsc0
-scsibus*	at mlhsc0
-scsibus*	at otgsc0
-scsibus*	at zssc0
-scsibus*	at mgnsc0
-scsibus*	at wesc0
-scsibus*	at idesc0
-scsibus*	at afsc0
-scsibus*	at aftsc0
-scsibus*	at flsc0
-scsibus*	at bzsc0
-
-# each hard drive from low target to high
-# will configure to the next available sd unit number
-sd*	at scsibus? target ? lun ?	# scsi disks
-
-st*	at scsibus? target ? lun ?	# scsi tapes
-cd*	at scsibus? target ? lun ?	# scsi cd's
-
-pseudo-device	ccd 4			# concat disks
-pseudo-device	sl			# slip
-pseudo-device	ppp			# ppp
-pseudo-device	view 10			# views
-pseudo-device	pty 16			# pseudo terminals
-pseudo-device	loop			# network loopback
-pseudo-device	bpfilter 12		# berkeley packet filters
-pseudo-device	tun 2
-pseudo-device	vnd	3		# 3 pseudo disks (see vnconfig)
-
-config	bsd swap on generic
diff --git a/sys/arch/amiga/conf/CRASH b/sys/arch/amiga/conf/CRASH
index 0b5f536eb0f..3ee26dc0580 100644
--- a/sys/arch/amiga/conf/CRASH
+++ b/sys/arch/amiga/conf/CRASH
@@ -1,4 +1,4 @@
-#	$OpenBSD: CRASH,v 1.6 1996/12/11 23:06:33 niklas Exp $
+#	$OpenBSD: CRASH,v 1.7 1997/01/16 09:23:34 niklas Exp $
 
 #
 # The first OpenBSD/Amiga "user" Neil Brewitt's GG2 + NE2000 equipped A3000
@@ -21,7 +21,6 @@ option		"M68030"	# support for 030
 option		FPCOPROC	# Support for MC6888[12] (Required)
 
 option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index d6cf4cee56b..96ed319e665 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,5 +1,5 @@
-#	$OpenBSD: DRACO,v 1.7 1996/12/11 23:06:34 niklas Exp $
-#	$NetBSD: DRACO,v 1.2.4.2 1996/09/06 00:28:31 jtc Exp $
+#	$OpenBSD: DRACO,v 1.8 1997/01/16 09:23:35 niklas Exp $
+#	$NetBSD: DRACO,v 1.7 1996/12/20 19:18:16 veego Exp $
 
 #
 # Macro System GmbH "DraCo", currently 68060-only until FPE is integrated.
@@ -24,10 +24,6 @@ option		"M68060"	# support for 060
 option		"M060SP"	# MC68060 software support (Required for 060)
 option		FPCOPROC	# Support for MC6888[12] (Required)
 
-#
-# pagers:
-#
-
 option		SWAPPAGER	# Pager for processes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
@@ -70,7 +66,7 @@ option		MSDOSFS		# MS-DOS filesystem
 #
 # Compatability options for various existing systems
 #
-#option		"COMPAT_10"	# compatability with older NetBSD release
+option		COMPAT_12
 #option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
 #option		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
 option		"COMPAT_NOMID"	# allow nonvalid machine id executables
@@ -95,7 +91,6 @@ option		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
 #
 # Misc. debuging options
 #
-option		PANICWAIT	# Require keystroke to dump/reboot
 option		DEBUG		# Add debugging statements
 option		DDB		# Kernel debugger
 #option		SYSCALL_DEBUG	# debug all syscalls.
@@ -156,8 +151,10 @@ scsibus*	at drsc0
 # will configure to the next available sd unit number
 sd*	at scsibus? target ? lun ?	# scsi disks
 st*	at scsibus? target ? lun ?	# scsi tapes
-ss*	at scsibus? target ? lun ?	# scsi scanner
 cd*	at scsibus? target ? lun ?	# scsi cd's
+ss*	at scsibus? target ? lun ?	# scsi scanner
+ch*	at scsibus? target ? lun ?	# scsi autochangers
+uk*	at scsibus? target ? lun ?	# scsi unknown
 
 pseudo-device	pty 16			# pseudo terminals
 pseudo-device	loop			# network loopback
diff --git a/sys/arch/amiga/conf/FILIPPA b/sys/arch/amiga/conf/FILIPPA
index 28c51c2c53d..4a1d7239ac2 100644
--- a/sys/arch/amiga/conf/FILIPPA
+++ b/sys/arch/amiga/conf/FILIPPA
@@ -1,4 +1,4 @@
-#	$OpenBSD: FILIPPA,v 1.13 1997/01/04 12:45:45 niklas Exp $
+#	$OpenBSD: FILIPPA,v 1.14 1997/01/16 09:23:36 niklas Exp $
 
 #
 # Niklas' AMIGA with ISA support
@@ -18,8 +18,8 @@ option		FPSP		# MC68040 floating point support
 #option		"M68020"	# support for 020/851
 option		FPCOPROC	# Support for MC6888[12] (Required)
 
-option		SWAPPAGER	# Pager for processes (Required)
-option		DEVPAGER	# Pager for devices (Required)
+option		SWAPPAGER
+option		DEVPAGER
 
 #
 # Networking option
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 324027289c7..fbf5e425fd7 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.17 1997/01/05 02:08:05 niklas Exp $
-#	$NetBSD: GENERIC,v 1.57.4.4 1996/09/06 00:34:18 jtc Exp $
+#	$OpenBSD: GENERIC,v 1.18 1997/01/16 09:23:37 niklas Exp $
+#	$NetBSD: GENERIC,v 1.67 1997/01/07 11:35:04 mrg Exp $
 
 #
 # GENERIC AMIGA
@@ -52,13 +52,14 @@ option		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
 #option		DEBUG		# Add debugging statements
 #option		SYSCALL_DEBUG	# debug all syscalls.
 #option		SCSIDEBUG	# Add SCSI debugging statements
-#option		KGDB		# Kernel debugger (KGDB) support
 #option		PANICBUTTON	# Forced crash via keypress (???)
 
 #
 # Amiga specific options
 #
 option		MACHINE_NONCONTIG # Non-contiguous memory support
+# ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete
+# before the 10 secondinterval ends, or that KBDRESET does work at all.
 #option		KBDRESET	# sync on Ctrl-Amiga-Amiga
 
 # These options improve performance with the built-in serial port
@@ -158,7 +159,8 @@ idesc0		at mainbus0		# A4000 & A1200 IDE
 afsc0		at zbus0		# A4091 scsi
 aftsc0		at mainbus0		# A4000T scsi
 flsc0		at zbus0		# FastlaneZ3 scsi
-bzsc0		at zbus0		# Blizzard 1230 scsi
+bzsc0		at zbus0		# Blizzard 1230 I,II scsi 
+bztzsc0		at zbus0		# Blizzard 1230 IV / 1260 / 2060
 empsc0		at zbus0		# Emplant
 drsc0		at mainbus0		# DraCo scsi
 
@@ -177,6 +179,7 @@ scsibus*	at afsc0
 scsibus*	at aftsc0
 scsibus*	at flsc0
 scsibus*	at bzsc0
+scsibus*	at bztzsc0
 scsibus*	at empsc0
 scsibus*	at drsc0
 
@@ -185,9 +188,9 @@ scsibus*	at drsc0
 sd*	at scsibus? target ? lun ?	# scsi disks
 st*	at scsibus? target ? lun ?	# scsi tapes
 cd*	at scsibus? target ? lun ?	# scsi cd's
-ch*	at scsibus? target ? lun ?	# scsi cd changers
 ss*	at scsibus? target ? lun ?	# scsi scanners
-uk*	at scsibus? target ? lun ?	# unknown scsi
+ch*	at scsibus? target ? lun ?	# scsi autochangers
+uk*	at scsibus? target ? lun ?	# scsi unknown
 
 ggbus*	at zbus0			# Goldengate bridge
 isa*	at ggbus?
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index fe2384e4bee..7f3194d98e3 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.amiga,v 1.16 1996/08/19 00:15:51 niklas Exp $
-#	$NetBSD: Makefile.amiga,v 1.45 1996/05/16 17:07:08 is Exp $
+#	$OpenBSD: Makefile.amiga,v 1.17 1997/01/16 09:23:38 niklas Exp $
+#	$NetBSD: Makefile.amiga,v 1.52 1996/12/01 12:10:07 veego Exp $
 
 # Makefile for OpenBSD
 #
@@ -22,32 +22,40 @@
 # 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
+MKDEP?=	mkdep
+STRIP?=	strip
 TOUCH?=	touch -f -c
+COPTS?=	-O2
 
 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-AMIGA=	../..
+.ifndef S
+S!=	cd ../../../..; pwd
+.endif
+AMIGA=	$S/arch/amiga
 
-INCLUDES=	-I. -I$S/arch -I$S
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Damiga
+INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmc68020 -Damiga
 
-CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
+CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
 		-Wno-format
 
 .if empty(IDENT:M-DM68060)
-CMACHFLAGS=	-m68020 -msoft-float
+CMACHFLAGS=	-m68020
 .else
-CMACHFLAGS=	-m68060 -Wa,-m68030 -msoft-float
+CMACHFLAGS=	-m68060 -Wa,-m68030
 .endif
+CMACHFLAGS+=	-msoft-float
 
-CFLAGS=		${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
+CFLAGS=		${DEBUG} ${CWARNFLAGS} ${COPTS} ${CMACHFLAGS}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start
+STRIPFLAGS=	-d
+
+HOSTCC?=	${CC}
+HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
+HOSTED_CFLAGS=	${CFLAGS}
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
@@ -71,14 +79,14 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 ### for the Motorola 68060 Software Support Package
 .include "$S/arch/m68k/060sp/Makefile.inc"
 
-# 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 $<
 
+HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
+
 DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 
@@ -115,9 +123,9 @@ DEBUG?=
 LINKFLAGS+=	-X
 SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} $@; ${STRIP} $@
+		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif
 
 %LOAD
@@ -126,17 +134,17 @@ assym.h: genassym
 	./genassym >assym.h
 
 genassym: genassym.o
-	${CC} -o $@ genassym.o
+	${HOSTCC} -o $@ genassym.o
 
 genassym.o: ${AMIGA}/amiga/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}
@@ -151,7 +159,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${AMIGA}/amiga/Locore.c ${CFILES} ${AMIGA}/amiga/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -171,10 +179,11 @@ SRCS=	${AMIGA}/amiga/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} \
+	    ${AMIGA}/amiga/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index f32d9764aee..505a5884eb4 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.amiga,v 1.18 1996/08/19 06:57:02 niklas Exp $
-#	$NetBSD: files.amiga,v 1.48 1996/05/19 21:04:50 veego Exp $
+#	$OpenBSD: files.amiga,v 1.19 1997/01/16 09:23:39 niklas Exp $
+#	$NetBSD: files.amiga,v 1.51 1996/12/16 16:17:31 is Exp $
 
 # maxpartitions must be first item in files.${ARCH}
 maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
@@ -160,6 +160,11 @@ device	mfcp
 attach	mfcp at mfc
 file	arch/amiga/dev/mfc.c		mfcs | mfcp needs-count
 
+# DraCo internal com port
+device	drcom: tty
+attach	drcom at mainbus
+file	arch/amiga/dev/drcom.c		drcom needs-count
+  
 include "../../../scsi/files.scsi"
 
 # wd 33c93 controllers
@@ -251,11 +256,16 @@ device	flsc: scsi, sfas
 attach	flsc at zbus
 file	arch/amiga/dev/flsc.c		flsc needs-flag
 
-# Blizzard1230
+# Blizzard1230-I,II
 device	bzsc: scsi, sfas
 attach	bzsc at zbus
 file	arch/amiga/dev/bzsc.c		bzsc needs-flag
 
+# Blizzard2060 scsi
+device	bztzsc: scsi, sfas
+attach	bztzsc at zbus
+file	arch/amiga/dev/bztzsc.c		bztzsc needs-flag
+
 # Amiga 4000/1200 IDE masquerading as SCSI
 device	idesc: scsi
 attach	idesc at mainbus
diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga
index 8840cf9a9b5..e109d2107f2 100644
--- a/sys/arch/amiga/conf/std.amiga
+++ b/sys/arch/amiga/conf/std.amiga
@@ -1,5 +1,5 @@
-#	$OpenBSD: std.amiga,v 1.3 1996/05/29 10:14:46 niklas Exp $
-#	$NetBSD: std.amiga,v 1.8 1996/05/09 20:31:03 is Exp $
+#	$OpenBSD: std.amiga,v 1.4 1997/01/16 09:23:40 niklas Exp $
+#	$NetBSD: std.amiga,v 1.10 1996/12/20 19:15:06 veego Exp $
 
 # standard amiga information
 
@@ -15,3 +15,6 @@ ms*	at mainbus0
 fdc0	at mainbus0
 fd*	at fdc0 unit ?
 zbus0	at mainbus0
+
+#options	SWAPPAGER	# paging
+#options	DEVPAGER	# mmap() of devices
diff --git a/sys/arch/amiga/conf/std.draco b/sys/arch/amiga/conf/std.draco
index a82c2881ef2..8a1031023c7 100644
--- a/sys/arch/amiga/conf/std.draco
+++ b/sys/arch/amiga/conf/std.draco
@@ -1,7 +1,7 @@
-#	$OpenBSD: std.draco,v 1.2 1996/10/04 15:05:40 niklas Exp $
-#	$NetBSD: std.draco,v 1.1 1996/05/09 20:31:04 is Exp $
+#	$OpenBSD: std.draco,v 1.3 1997/01/16 09:23:41 niklas Exp $
+#	$NetBSD: std.draco,v 1.2 1996/12/20 19:15:07 veego Exp $
 
-# standard amiga information
+# standard DraCo information
 
 machine amiga m68k
 
@@ -10,3 +10,6 @@ mainbus0	at root
 clock0	at mainbus0
 kbd0	at mainbus0
 zbus0	at mainbus0
+
+#options	SWAPPAGER	# paging
+#options	DEVPAGER	# mmap() of devices