initial import of NetBSD tree

6 files changed, 996 insertions, 0 deletions

diff --git a/sys/arch/amiga/conf/A3000 b/sys/arch/amiga/conf/A3000
new file mode 100644
index 00000000000..32673ca6f07
--- /dev/null
+++ b/sys/arch/amiga/conf/A3000
@@ -0,0 +1,109 @@
+#	$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 "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		VNODEPAGER	# Pager for vnodes
+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		netbsd 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
new file mode 100644
index 00000000000..860fcb0885c
--- /dev/null
+++ b/sys/arch/amiga/conf/COFFEE
@@ -0,0 +1,222 @@
+#	$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 "std.amiga"
+
+maxusers	8
+options		TIMEZONE=300, DST=1
+
+#
+# processors this kernel should support
+#
+options		"M68040"	# support for 040
+options		FPSP		# MC68040 floating point support
+options		"M68030"	# support for 030
+options		"M68020"	# support for 020/851
+options		FPCOPROC	# Support for MC6888[12] (Required)
+
+options		SWAPPAGER	# Pager for processes (Required)
+options		VNODEPAGER	# Pager for vnodes (Required)
+options		DEVPAGER	# Pager for devices (Required)
+
+#
+# Networking options
+#
+options		INET		# IP networking support (Required)
+#options	ISO		# ISO Networking support
+#options	TPIP		# ARGO TP networking support
+#options	CCITT		# CCITT X.25
+#options	NS		# Xerox XNS
+#options	EON		# ISO CLNL over IP
+options		GATEWAY		# Packet forwarding
+#options	DIRECTED_BROADCAST	# Broadcast across subnets
+#options	NSIP		# XNS over IP
+
+#
+# File system related options
+#
+options		QUOTA		# Disk quotas for local disks
+options		NFSSERVER	# Network File System server side code
+options		NFSCLIENT	# Network File System client side code
+
+#
+# File systems
+#
+options		FFS		# Berkeley fast file system
+options		MFS		# Memory based filesystem
+options		PROCFS		# Process filesystem
+options		KERNFS		# Kernel parameter filesystem (Recommended)
+options		FDESC		# /dev/fd filesystem
+options		NULLFS		# Loopback filesystem
+options		FIFO		# FIFO operations on vnodes (Recommended)
+options		ADOSFS		# AmigaDOS file system
+options		"CD9660"	# ISO 9660 file system, with Rock Ridge
+#options	PORTAL		# Portal filesystem
+#options	MSDOSFS		# MS-DOS filesystem
+
+
+#
+# Compatability options for various existing systems
+#
+options		"COMPAT_10"	# compatability with older NetBSD release
+options		"COMPAT_09"	# compatability with older NetBSD release
+options		"COMPAT_43"	# 4.3 BSD compatible system calls
+options		COMPAT_SUNOS	# Support to run Sun (m68k) executables
+options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
+options		"COMPAT_NOMID"	# allow nonvalid machine id executables
+#options	COMPAT_HPUX	# HP300 compatability
+
+#
+# Support for System V IPC facilities.
+#
+options		SYSVSHM		# System V-like shared memory
+options		SYSVMSG		# System V-like messages
+options		SYSVSEM		# System V-like semaphores
+
+#
+# Support for various kernel options
+#
+options		GENERIC		# Mini-root boot support
+options		LKM		# Loadable kernel modules
+options		KTRACE		# Add kernel tracing system call
+options		DIAGNOSTIC	# Add additional error checking code
+options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+
+#
+# Misc. debuging options
+#
+options		PANICWAIT	# Require keystroke to dump/reboot
+options		DEBUG		# Add debugging statements
+options		DDB		# Kernel debugger
+#options	SYSCALL_DEBUG	# debug all syscalls.
+#options	SCSIDEBUG	# Add SCSI debugging statements
+#options	KGDB		# Kernel debugger (KGDB) support
+#options	PANICBUTTON	# Forced crash via keypress (???)
+
+#
+# Amiga specific options
+#
+options		MACHINE_NONCONTIG # Non-contiguous memory support
+
+options		RETINACONSOLE	# enable code to allow retina to be console
+options		ULOWELLCONSOLE	# enable code to allow a2410 to be console
+options         CL5426CONSOLE   # Cirrus console
+
+options		GRF_ECS		# Enhanced Chip Set
+options		GRF_NTSC	# NTSC
+options		GRF_PAL		# PAL
+options		"GRF_A2024"	# Support for the A2024
+options		GRF_AGA		# AGA Chip Set
+options		GRF_CL5426	# Cirrus board support
+#options	"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
+#options	"ULOWELL_OSC1=36000000"
+#options	"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.
+#options	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.
+#options	RH_64BIT_SPRITE
+# enables fast scroll code appears to now work on 040 systems.
+#options	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	netbsd swap on generic
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
new file mode 100644
index 00000000000..29aa250cc76
--- /dev/null
+++ b/sys/arch/amiga/conf/GENERIC
@@ -0,0 +1,221 @@
+#	$NetBSD: GENERIC,v 1.48 1995/10/09 15:23:22 chopps Exp $
+
+#
+# GENERIC AMIGA
+#
+# This configuration file contains all possible options
+#
+
+include "std.amiga"
+
+maxusers	8
+options		TIMEZONE=300, DST=1
+
+#
+# processors this kernel should support
+#
+options		"M68040"	# support for 040
+options		FPSP		# MC68040 floating point support
+options		"M68030"	# support for 030
+options		"M68020"	# support for 020/851
+options		FPCOPROC	# Support for MC6888[12] (Required)
+
+options		SWAPPAGER	# Pager for processes (Required)
+options		VNODEPAGER	# Pager for vnodes (Required)
+options		DEVPAGER	# Pager for devices (Required)
+
+#
+# Networking options
+#
+options		INET		# IP networking support (Required)
+#options	ISO		# ISO Networking support
+#options	TPIP		# ARGO TP networking support
+#options	CCITT		# CCITT X.25
+#options	NS		# Xerox XNS
+#options	EON		# ISO CLNL over IP
+#options	GATEWAY		# Packet forwarding
+#options	DIRECTED_BROADCAST	# Broadcast across subnets
+#options	NSIP		# XNS over IP
+
+#
+# File system related options
+#
+options		QUOTA		# Disk quotas for local disks
+options		NFSSERVER	# Network File System server side code
+options		NFSCLIENT	# Network File System client side code
+
+#
+# File systems
+#
+options		FFS		# Berkeley fast file system
+options		MFS		# Memory based filesystem
+options		PROCFS		# Process filesystem
+options		KERNFS		# Kernel parameter filesystem (Recommended)
+options		FDESC		# /dev/fd filesystem
+options		NULLFS		# Loopback filesystem
+options		FIFO		# FIFO operations on vnodes (Recommended)
+options		ADOSFS		# AmigaDOS file system
+options		"CD9660"	# ISO 9660 file system, with Rock Ridge
+#options	PORTAL		# Portal filesystem
+#options	MSDOSFS		# MS-DOS filesystem
+
+
+#
+# Compatability options for various existing systems
+#
+options		"COMPAT_10"	# compatability with older NetBSD release
+options		"COMPAT_09"	# compatability with older NetBSD release
+options		"COMPAT_43"	# 4.3 BSD compatible system calls
+options		COMPAT_SUNOS	# Support to run Sun (m68k) executables
+options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
+options		"COMPAT_NOMID"	# allow nonvalid machine id executables
+#options	COMPAT_HPUX	# HP300 compatability
+
+#
+# Support for System V IPC facilities.
+#
+options		SYSVSHM		# System V-like shared memory
+options		SYSVMSG		# System V-like messages
+options		SYSVSEM		# System V-like semaphores
+
+#
+# Support for various kernel options
+#
+options		GENERIC		# Mini-root boot support
+options		LKM		# Loadable kernel modules
+options		KTRACE		# Add kernel tracing system call
+options		DIAGNOSTIC	# Add additional error checking code
+options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+
+#
+# Misc. debuging options
+#
+options		PANICWAIT	# Require keystroke to dump/reboot
+#options	DEBUG		# Add debugging statements
+options		DDB		# Kernel debugger
+#options	SYSCALL_DEBUG	# debug all syscalls.
+#options	SCSIDEBUG	# Add SCSI debugging statements
+#options	KGDB		# Kernel debugger (KGDB) support
+#options	PANICBUTTON	# Forced crash via keypress (???)
+
+#
+# Amiga specific options
+#
+options		MACHINE_NONCONTIG # Non-contiguous memory support
+
+options		RETINACONSOLE	# enable code to allow retina to be console
+options		ULOWELLCONSOLE	# enable code to allow a2410 to be console
+options         CL5426CONSOLE   # Cirrus console
+
+options		GRF_ECS		# Enhanced Chip Set
+options		GRF_NTSC	# NTSC
+options		GRF_PAL		# PAL
+options		"GRF_A2024"	# Support for the A2024
+options		GRF_AGA		# AGA Chip Set
+options		GRF_CL5426	# Cirrus board support
+#options	"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
+#options	"ULOWELL_OSC1=36000000"
+#options	"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.
+#options	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.
+#options	RH_64BIT_SPRITE
+# enables fast scroll code appears to now work on 040 systems.
+#options	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		# CyverVision 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	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 2		# berkeley packet filters
+#pseudo-device	tun 2
+
+config	netbsd swap on generic
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
new file mode 100644
index 00000000000..f3820465088
--- /dev/null
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -0,0 +1,177 @@
+#	$NetBSD: Makefile.amiga,v 1.28 1995/10/09 15:23:25 chopps Exp $
+
+#	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
+#
+# Makefile for 4.4 BSD
+#
+# This makefile is constructed from a machine description:
+#	config machineid
+# Most changes should be made in the machine description
+#	/sys/conf/``machineid''
+# after which you should do
+#	 config machineid
+# Machine generic makefile changes should be made in
+#	/sys/conf/Makefile.``machinetype''
+# after which config should be rerun for all machines of that type.
+#
+# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
+#	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
+#
+# -DTRACE	compile in kernel tracing hooks
+# -DQUOTA	compile in file system quotas
+
+
+# DEBUG is set to -g by config if debugging is requested (config -g).
+# PROF is set to -pg by config if profiling is requested (config -p).
+AS=	as ${DEBUG}
+CC=	cc ${DEBUG}
+CPP=	cpp
+LD=	ld 
+TOUCH=	touch -f -c
+
+# source tree is located via $S relative to the compilation directory
+S=	../../../..
+AMIGA=	../..
+
+INCLUDES= -I. -I$S/arch -I$S -I$S/sys 
+COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Damiga
+CFLAGS=	-O -Werror -fno-builtin -mc68020 -m68881 ${COPTS}
+
+### find out what to use for libkern
+.include "$S/lib/libkern/Makefile.inc"
+.ifndef PROF
+LIBKERN=	${KERNLIB}
+.else
+LIBKERN=	${KERNLIB_PROF}
+.endif
+
+### find out what to use for libcompat
+.include "$S/compat/common/Makefile.inc"
+.ifndef PROF
+LIBCOMPAT=	${COMPATLIB}
+.else
+LIBCOMPAT=	${COMPATLIB_PROF}
+.endif
+
+### for the Motorola 68040 Floating Point Software Product
+.include "$S/arch/m68k/fpsp/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.
+
+NORMAL_C=	${CC} -c ${CFLAGS} ${PROF} $<
+NORMAL_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+
+DRIVER_C=	${CC} -c ${CFLAGS} ${PROF} $<
+DRIVER_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+
+PROFILE_C=	${CC} -S -c ${COPTS} $<; \
+		sed -e s/_mcount/mcount/ -e s/subrmcount/subr_mcount/ <$*.s | \
+		${AS} -o $@; \
+		rm -f $*.s
+
+NORMAL_S=	${CPP} ${COPTS} $< | ${AS} -o $@
+NORMAL_S_C=	${CPP} ${COPTS} ${PARAM} $< | ${AS} -o $@
+
+%OBJS
+
+%CFILES
+
+# load lines for config "xxx" will be emitted as:
+# xxx: ${SYSTEM_DEP} swapxxx.o
+#	${SYSTEM_LD_HEAD}
+#	${SYSTEM_LD} swapxxx.o
+#	${SYSTEM_LD_TAIL}
+SYSTEM_OBJ=	locore.o ${FPSP} vnode_if.o ${OBJS} param.o ioconf.o \
+		${LIBKERN} ${LIBCOMPAT}
+SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
+SYSTEM_LD_HEAD=	rm -f $@
+SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
+		then strip=-X; \
+		else strip=-x; \
+		fi; \
+		echo ${LD} $$strip -n -T 0 -o $@ -e start '$${SYSTEM_OBJ}' vers.o; \
+		${LD} $$strip -n -T 0 -o $@ -e start ${SYSTEM_OBJ} vers.o
+SYSTEM_LD_TAIL=	@size $@; chmod 755 $@; \
+		[ X${DEBUG} = X-g ] && { \
+		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
+		echo strip -d $@; strip -d $@; } || true
+
+%LOAD
+
+vers.o:	newvers
+
+newvers:
+	sh $S/conf/newvers.sh ${KERN_IDENT}
+	${CC} $(CFLAGS) -c vers.c
+
+clean::
+	rm -f eddep *netbsd netbsd.gdb tags *.o locore.i [a-z]*.s \
+		Errs errs linterrs makelinks genassym
+
+lint: /tmp param.c
+	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
+	    ${AMIGA}/amiga/Locore.c ${CFILES} ${AMIGA}/amiga/swapgeneric.c \
+	    ioconf.c param.c| \
+	    grep -v 'struct/union .* never defined' | \
+	    grep -v 'possible pointer alignment problem'
+
+locore.o: assym.s ${AMIGA}/amiga/vectors.s ${AMIGA}/amiga/locore.s 
+locore.o: machine/trap.h machine/psl.h machine/pte.h machine/cpu.h
+	${CPP} -DLOCORE ${COPTS} ${AMIGA}/amiga/locore.s | ${AS} -o locore.o
+
+# the following is necessary because autoconf.o depends on #if GENERIC
+autoconf.o: Makefile
+
+# the following are necessary because the files depend on the types of
+# hp cpu's included in the system configuration
+machdep.o sys_machdep.o pmap.o pmap_bootstrap.o trap.o dma.o:	Makefile
+
+# depend on network or filesystem configuration
+uipc_proto.o vfs_conf.o locore.o:	Makefile
+
+# depend on maxusers
+assym.s: Makefile
+
+assym.s: genassym
+	./genassym >assym.s
+
+genassym:
+	${CC} -static ${INCLUDES} ${IDENT} ${PARAM} -Dmc68020 -Damiga \
+	    -o genassym ${AMIGA}/amiga/genassym.c
+
+depend: assym.s param.c vnode_if.h grf_ultmscode.h
+	mkdep ${COPTS} ${CFILES} ioconf.c param.c
+	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${AMIGA}/amiga/genassym.c
+
+links:
+	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
+	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
+	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	  sort -u | comm -23 - dontlink | \
+	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
+	sh makelinks && rm -f dontlink
+
+tags:
+	@echo "see $S/kern/Makefile for tags"
+
+ioconf.o: ioconf.c
+	${CC} -c ${CFLAGS} ioconf.c
+
+param.c: $S/conf/param.c
+	rm -f param.c
+	cp $S/conf/param.c .
+
+param.o: param.c Makefile
+	${CC} -c ${CFLAGS} ${PARAM} param.c
+vnode_if.c vnode_if.h:	$S/kern/vnode_if.sh $S/kern/vnode_if.src
+	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
+
+grf_ultmscode.h: ${AMIGA}/dev/grf_ul.gsp
+	gspa < ${AMIGA}/dev/grf_ul.gsp | gspahextoc > grf_ultmscode.h
+
+grf_ul.o:	grf_ultmscode.h
+
+%RULES
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
new file mode 100644
index 00000000000..80b4d8485de
--- /dev/null
+++ b/sys/arch/amiga/conf/files.amiga
@@ -0,0 +1,249 @@
+#	$NetBSD: files.amiga,v 1.31 1995/10/09 02:08:38 chopps Exp $
+
+# maxpartitions must be first item in files.${ARCH}.newconf
+maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
+
+maxusers 2 8 64
+
+device	mainbus at root {}
+
+device	cpu at mainbus
+
+# zorro II expansion bus.
+device	zbus at mainbus {}
+file	arch/amiga/dev/zbus.c		zbus
+
+define	event {}
+file	arch/amiga/dev/event.c		event
+
+device	clock at mainbus
+file	arch/amiga/dev/clock.c
+
+# keyboard
+device	kbd at mainbus: event
+file	arch/amiga/dev/kbd.c		kbd needs-flag
+
+# serial port
+device	ser at mainbus:	tty
+file	arch/amiga/dev/ser.c		ser needs-count
+
+# parellel port
+device	par at mainbus
+file	arch/amiga/dev/par.c		par needs-count
+
+# mouse
+pseudo-device	mouse
+file	arch/amiga/dev/ms.c		mouse needs-count
+
+device	fdc at mainbus { unit = -1 }
+
+device	fd at fdc
+file	arch/amiga/dev/fd.c		fd needs-flag
+major	{fd = 2}
+
+# graphic devices
+define	grfbus {}
+
+device	grf at grfbus {}
+file	arch/amiga/dev/grf.c		grf needs-count
+
+device	ite at grf
+file	arch/amiga/dev/ite.c		ite needs-flag
+file	arch/amiga/dev/kbdmap.c		ite
+file	arch/amiga/dev/kf_8x8.c		ite
+file	arch/amiga/dev/kf_8x11.c	kfont_8x11
+file	arch/amiga/dev/kf_custom.c	kfont_custom
+
+# custom chips grf
+device	grfcc at mainbus: grfbus
+file	arch/amiga/dev/grf_cc.c		grfcc needs-flag
+file	arch/amiga/dev/ite_cc.c		grfcc ite
+
+pseudo-device	view
+file	arch/amiga/dev/view.c		view grfcc needs-count
+file	arch/amiga/dev/grfabs.c		grfcc view
+file	arch/amiga/dev/grfabs_cc.c	grfcc view
+file	arch/amiga/dev/grfabs_ccglb.c	grfcc view
+
+# retina grf
+device	grfrt at zbus: grfbus
+file	arch/amiga/dev/grf_rt.c		grfrt needs-flag
+file	arch/amiga/dev/ite_rt.c		grfrt ite
+
+# cirrus grf
+device	grfcl at zbus: grfbus
+file	arch/amiga/dev/grf_cl.c		grfcl needs-flag
+file    arch/amiga/dev/ite_cl.c         grfcl ite
+
+# CyberVison 64 grf
+device	grfcv at zbus: grfbus
+file	arch/amiga/dev/grf_cv.c		grfcv needs-flag
+
+# A2410 grf
+device	grful at zbus: grfbus
+file	arch/amiga/dev/grf_ul.c		grful needs-flag
+file    arch/amiga/dev/ite_ul.c         grful ite
+
+# retina ZIII grf
+device	grfrh at zbus: grfbus
+file	arch/amiga/dev/grf_rh.c		grfrh needs-flag
+file	arch/amiga/dev/ite_rh.c		grfrh ite
+  
+# handle gvp's odd autoconf info..
+device	gvpbus at zbus {}
+file	arch/amiga/dev/gvpbus.c		gvpbus
+
+device	le at zbus:	ifnet, ether
+file	arch/amiga/dev/if_le.c		le needs-count
+
+device	ed at zbus:	ifnet, ether
+file	arch/amiga/dev/if_ed.c		ed needs-flag
+
+# C=/Ameristar A2060 / 560
+device	bah at zbus: ifnet, arc
+file	arch/amiga/dev/if_bah.c		bah needs-flag
+
+device	es at zbus:	ifnet, ether
+file	arch/amiga/dev/if_es.c		es needs-count
+
+device	qn at zbus:	ifnet, ether
+file	arch/amiga/dev/if_qn.c		qn needs-flag
+
+device	ae at zbus:	ifnet, ether
+file	arch/amiga/dev/if_ae.c		ae needs-count
+
+# A2232 msc serial ports
+device	msc at zbus:	tty
+file	arch/amiga/dev/msc.c		msc needs-count
+
+# Alf Data MultiFaceCard 3
+#device	mfch at zbus: tty
+#file	arch/amiga/dev/mfch.c		mfch needs-count
+# bsc/Alf Data MultiFaceCard
+device	mfc at zbus { unit = -1 }
+
+device	mfcs at mfc
+device	mfcp at mfc
+file	arch/amiga/dev/mfc.c		mfcs mfcp needs-count
+
+define	scsi {}
+
+# wd 33c93 contrllers
+define	sbic 
+file	arch/amiga/dev/sbic.c		sbic
+
+# C= A2091
+device atzsc at zbus: scsi, sbic
+file	arch/amiga/dev/atzsc.c		atzsc needs-flag
+
+# GVP series II
+device	gtsc at gvpbus: scsi, sbic
+file	arch/amiga/dev/gtsc.c		gtsc needs-flag
+
+# Amiga 3000 internal
+device	ahsc at mainbus: scsi, sbic
+file	arch/amiga/dev/ahsc.c		ahsc needs-flag
+
+# ncr 57c710 controllers
+define	siop
+file	arch/amiga/dev/siop.c		siop
+
+# PPI Zeus
+device	zssc at zbus: scsi, siop
+file	arch/amiga/dev/zssc.c		zssc needs-flag
+
+# CSA Magnum
+device	mgnsc at zbus: scsi, siop
+file	arch/amiga/dev/mgnsc.c		mgnsc needs-flag
+
+# MacroSystems Warp Engine
+device	wesc at zbus: scsi, siop
+file	arch/amiga/dev/wesc.c		wesc needs-flag
+
+# C= A4091
+device	afsc at zbus: scsi, siop
+device	aftsc at mainbus: scsi, siop
+file	arch/amiga/dev/afsc.c		afsc needs-flag
+
+# ncr 5380 controllers
+define	sci
+file	arch/amiga/dev/sci.c		sci
+
+# Supra Wordsync II
+device	wstsc at zbus: scsi, sci
+file	arch/amiga/dev/wstsc.c		wstsc needs-flag
+
+# IVS 
+device	ivsc at zbus: scsi, sci
+file	arch/amiga/dev/ivsc.c		ivsc needs-flag
+
+# CSA twelve gauge.
+device	otgsc at zbus: scsi, sci
+file	arch/amiga/dev/otgsc.c		otgsc needs-flag
+
+# MLH
+device	mlhsc at zbus: scsi, sci
+file	arch/amiga/dev/mlhsc.c		mlhsc needs-flag
+
+# Emulex ESP216 & FAS216 controllers
+define	sfas
+file	arch/amiga/dev/sfas.c		sfas
+
+# FastlaneZ3
+device	flsc at zbus: scsi, sfas
+file	arch/amiga/dev/flsc.c		flsc needs-flag
+
+# Blizzard1230
+device	bzsc at zbus: scsi, sfas
+file	arch/amiga/dev/bzsc.c		bzsc needs-flag
+
+# Amiga 4000/1200 IDE masquerading as SCSI
+device	idesc at mainbus: scsi
+file	arch/amiga/dev/idesc.c		idesc needs-flag
+
+device	scsibus at scsi	{target = -1, lun = -1}
+
+device	cd at scsibus: disk
+file	scsi/cd.c			cd needs-flag
+major	{cd = 6}
+device	sd at scsibus: disk
+file	scsi/sd.c			sd needs-flag
+major	{sd = 4}
+device	st at scsibus: tape
+file	scsi/st.c			st needs-flag
+major	{st = 5}
+device	ch at scsibus: disk
+file	scsi/ch.c			ch needs-flag
+device	uk at scsibus: disk
+file	scsi/uk.c			uk needs-flag
+device	su at scsibus: disk
+file	scsi/su.c			su needs-flag
+
+
+# list of standard files...
+file	dev/cons.c			ite ser
+file	dev/cninit.c			ite ser
+file	scsi/scsi_base.c		scsi
+file	scsi/scsi_ioctl.c		scsi
+file	scsi/scsiconf.c			scsi
+file	arch/amiga/amiga/amiga_init.c
+file	arch/amiga/amiga/autoconf.c
+file	arch/amiga/amiga/cia.c
+file	arch/amiga/amiga/conf.c
+file	arch/amiga/amiga/disksubr.c
+file	arch/amiga/amiga/dkbad.c
+file	arch/amiga/amiga/machdep.c
+file	arch/amiga/amiga/mem.c
+file	arch/amiga/amiga/pmap.c
+file	arch/amiga/amiga/sys_machdep.c
+file	arch/amiga/amiga/trap.c
+file	arch/amiga/amiga/vm_machdep.c
+file	arch/amiga/amiga/cc.c
+file	arch/amiga/amiga/db_memrw.c	ddb
+file	arch/m68k/m68k/copy.s
+
+# Compatibility modules
+
+# SunOS Binary Compatibility (COMPAT_SUNOS)
+include "../../../compat/sunos/files.sunos"
+file	arch/m68k/m68k/sunos_machdep.c	compat_sunos
diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga
new file mode 100644
index 00000000000..725b6cc9228
--- /dev/null
+++ b/sys/arch/amiga/conf/std.amiga
@@ -0,0 +1,18 @@
+#	$NetBSD: std.amiga,v 1.5 1994/12/28 09:13:45 chopps Exp $
+
+# standard amiga information
+
+machine amiga m68k
+
+mainbus0	at root
+
+clock0	at mainbus0
+ser0	at mainbus0
+par0	at mainbus0
+kbd0	at mainbus0
+fdc0	at mainbus0
+fd0	at fdc0 unit 0
+zbus0	at mainbus0
+# zthreebus0	at mainbus0
+
+pseudo-device mouse 2