amiga and sun3 turned out to not be y2k+3 compliant here. Remove them, as

well as the few userland tools which were only used on these platforms.

7 files changed, 0 insertions, 1329 deletions

diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
deleted file mode 100644
index 35479a90ad8..00000000000
--- a/sys/arch/amiga/conf/DRACO
+++ /dev/null
@@ -1,161 +0,0 @@
-#	$OpenBSD: DRACO,v 1.19 2002/08/03 08:55:35 pvalchev 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.
-#
-
-# this will be replace by std.amiga soon:
-include "arch/amiga/conf/std.draco"
-
-maxusers	8
-option		TIMEZONE=300, DST=1
-
-#
-# mainboards to support (in addition to Amiga)
-#
-option		DRACO
-
-#
-# processors this kernel should support
-#
-
-option		"M68060"	# support for 060
-option		"M060SP"	# MC68060 software support (Required for 060)
-
-#
-# 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		PORTAL		# Portal filesystem
-option		MSDOSFS		# MS-DOS filesystem
-
-
-#
-# Compatibility options for various existing systems
-#
-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
-#option		COMPAT_HPUX	# HP300 compatibility
-
-#
-# 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
-
-#
-# Misc. debugging options
-#
-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		RETINACONSOLE	# enable code to allow retina to be console
-
-#option		"KFONT_8X11"	# 8x11 font
-
-# This is how you specify the blitting speed, higher values may speed up blits
-# a little 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
-# enables the Hardwarecursor which does not work on some systems.
-#option		RH_HARDWARECURSOR
-
-grfrh0		at zbus0		# Altais looks just like the Retina Z3
-grf2		at grfrh0
-ite2		at grf2			# 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
-
-drbbc0		at mainbus0		# DraCo battery backed clock
-drsupio0	at mainbus0		# DraCo superio chip
-com*		at drsupio? port ?	# DraCo serial
-
-le*		at zbus0		# Lance ethernet.
-ed0		at zbus0		# dp8390 ethernet
-es0		at zbus0		# SMC 91C90 ethernet
-qn0		at zbus0		# quicknet ethernet
-bah*		at zbus0		# C= arcnet
-
-
-# scsi stuff
-drsc0		at mainbus0		# DraCo mainboard scsi
-scsibus*	at drsc0
-
-# 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
-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
-pseudo-device	bpfilter 2		# berkeley packet filters
-pseudo-device	tun 2
-pseudo-device	ppp 2
-
-config	bsd swap on generic
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
deleted file mode 100644
index b98478d8406..00000000000
--- a/sys/arch/amiga/conf/GENERIC
+++ /dev/null
@@ -1,284 +0,0 @@
-#	$OpenBSD: GENERIC,v 1.40 2002/08/03 08:55:35 pvalchev Exp $
-#	$NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $
-
-#
-# GENERIC AMIGA
-#
-# This configuration file contains all possible options
-#
-
-include "arch/amiga/conf/std.amiga"
-include "conf/GENERIC"
-
-maxusers	8
-
-#
-# mainboards to support (in addition to Amiga)
-#
-option		DRACO
-option	 	BB060STUPIDROM	# You need this, if you have a non-DraCo
-				# 68060 with an OS ROM up to (at least) 
-				# V40 (OS3.1) and want to boot with the
-				# bootblock.
-				# You don't need this if you have a DraCo,
-				# have no 68060 or NEVER use the bootblock
-
-#
-# processors this kernel should support
-#
-option		M68060		# support for 060
-option		M060SP		# ...and MC68060 support package
-option		M68040		# support for 040
-option		FPSP		# MC68040 floating point support
-option		M68030		# support for 030
-option		M68020		# support for 020/851
-option		FPU_EMULATE	# FPU emulation
-
-#
-# File systems
-#
-option		ADOSFS		# AmigaDOS file system
-
-#
-# Compatibility options for various existing systems
-#
-option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
-#option		COMPAT_HPUX	# HP300 compatibility
-
-#
-# Support for various kernel options
-#
-
-option		GENERIC		# Mini-root boot support
-
-#
-# Misc. debugging options
-#
-#option		DEBUG		# Add debugging statements
-#option		SYSCALL_DEBUG	# debug all syscalls.
-#option		SCSIDEBUG	# Add SCSI debugging statements
-#option		PANICBUTTON	# Forced crash via keypress (???)
-
-#
-# Amiga specific options
-#
-# 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
-# on slower Amigas.  Try the larger buffers first then lev6_defer.
-#option		"SERIBUF_SIZE=4096"
-#option		"SEROBUF_SIZE=32"
-#option		LEV6_DEFER	# defers l6 to l4 (below serial l5)
-option		IPL_REMAP_1	# use remapping interruptsystem version 1
-#option		IPL_REMAP_2	# and version 2 (not yet done)
-
-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		CV64CONSOLE	# CyberVision console
-option		TSENGCONSOLE	# Tseng 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		"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 little 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
-# enables the Hardwarecursor which does not work on some systems.
-#option		RH_HARDWARECURSOR
-
-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
-grfet*		at zbus0		# Tseng (oMniBus, Domino, Merlin)
-
-grf0		at grfcc0
-grf1		at grfrt0
-grf2		at grfrh0
-grf3		at grfcl?
-grf4		at grful0
-grf5		at grfcv0
-grf6		at grfet?
-
-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
-ite5		at grf5			# terminal emulators for grf's
-ite6		at grf6			# 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
-
-drbbc0		at mainbus0		# DraCo battery backed clock
-drsupio0	at mainbus0		# DraCo superio chip
-#com*		at drsupio? port ?	# DraCo serial
-
-a2kbbc0 	at mainbus0		# A2000 battery backed clock
-a34kbbc0	at mainbus0		# A3000/A4000 battery backed clock
-joy0		at mainbus0
-aucc*		at mainbus0		# Amiga CC audio
-audio*		at aucc?
-
-# Ethernet cards
-le*		at zbus0		# Lance ethernet.
-ne*		at zbus0		# AriadneII
-ed0		at zbus0		# dp8390 ethernet
-es0		at zbus0		# SMC 91C90 ethernet
-qn0		at zbus0		# quicknet ethernet
-
-# Arcnet
-bah*		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		# A2091 scsi
-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
-afsc0		at zbus0		# A4091 scsi
-aftsc0		at mainbus0		# A4000T scsi
-flsc0		at zbus0		# FastlaneZ3 scsi
-bzsc0		at zbus0		# Blizzard 1230 I,II scsi
-bztzsc0		at zbus0		# Blizzard 2060 scsi
-empsc0		at zbus0		# Emplant scsi
-idesc0		at mainbus0		# A4000 & A1200 IDE
-drsc0		at mainbus0		# DraCo 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 afsc0
-scsibus*	at aftsc0
-scsibus*	at flsc0
-scsibus*	at bzsc0
-scsibus*	at bztzsc0
-scsibus*	at empsc0
-scsibus*	at idesc0
-scsibus*	at drsc0
-
-# 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
-ss*	at scsibus? target ? lun ?	# scsi scanners
-ch*	at scsibus? target ? lun ?	# scsi autochangers
-uk*	at scsibus? target ? lun ?	# scsi unknown
-
-ggbus*	at zbus0			# Goldengate bridge
-isa*	at ggbus?
-
-cross*	at zbus0			# CrossLink bridge
-isa*	at cross?
-
-#isapnp0	at isa?
-
-# ISA PCMCIA controllers
-pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
-pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
-
-# PCMCIA bus support
-pcmcia*	at pcic? controller ? socket ?
-
-option		PCMCIAVERBOSE
-
-#com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
-#com1	at isa? port 0x2f8 irq 3
-#com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
-#com4	at isa? port 0x0f0 irq 11	# Crosslink builtin ports
-#com5	at isa? port 0x0f8 irq 10
-#ast0	at isa? port 0x1a0 irq 3	# AST 4-port serial cards
-#com*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-# option for using CD1400 handshaking for incoming data
-# requires a special cable that exchanges the RTS and DTR lines
-# options CY_HW_RTS
-# cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
-#com*	at pcmcia? function ?		# PCMCIA modems/serial ports
-
-lpt0	at isa? port 0x378 irq 7	# Standard PC parallel ports
-lpt1	at isa? port 0x278
-lpt2	at isa? port 0x3bc
-
-aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
-aic*	at pcmcia? function ?		# PCMCIA based aic SCSI controllers
-scsibus* at aic?
-
-# IDE controllers
-wdc0    at isa? port 0x1f0 irq 14 flags 0x00
-wdc1    at isa? port 0x170 irq 15 flags 0x00
-wdc*    at pcmcia? function ?
-#wdc*    at isapnp?
-
-# IDE hard drives
-wd*     at wdc? channel ? drive ? flags 0x0000
-
-# ATAPI<->SCSI
-atapiscsi* at wdc? channel ?
-scsibus* at atapiscsi?
-
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
-we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
-ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
-ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet cards
-#ne*	at isapnp?				# NE[12]000 PnP ethernet cards
-ep0	at isa? port ? irq ?			# 3C509 ethernet
-#ep*	at isapnp?				# 3C509 PnP ethernet
-ep*	at isa? port ? irq ?			# 3C509 ethernet
-ne*	at pcmcia? function ?			# PCMCIA based NE2000 ethernet
-ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-sm*	at pcmcia? function ?			# PCMCIA based sm ethernet
-
-fd*	at fdc0 unit ?
-
-pseudo-device	view	10		# views
-
-config	bsd swap on generic
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
deleted file mode 100644
index f6706e608e0..00000000000
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ /dev/null
@@ -1,211 +0,0 @@
-#	$OpenBSD: Makefile.amiga,v 1.34 2002/12/25 21:10:26 miod Exp $
-#	$NetBSD: Makefile.amiga,v 1.60 1997/07/23 10:19:42 is Exp $
-
-# Makefile for OpenBSD
-#
-# This makefile is constructed from a machine description:
-#	config machineid
-# Most changes should be made in the machine description
-#	/sys/arch/amiga/conf/``machineid''
-# after which you should do
-#	config machineid
-# Machine generic makefile changes should be made in
-#	/sys/arch/amiga/conf/Makefile.amiga
-# 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 if debugging.
-# PROF is set to -pg if profiling.
-
-.include <bsd.own.mk>
-
-MKDEP?=	mkdep
-SIZE?=	size
-STRIP?=	strip
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!=	cd ../../../..; pwd
-.endif
-AMIGA=	$S/arch/amiga
-M68K=	$S/arch/m68k
-
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
-		-Dmc68020 -Damiga
-CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-		-Wno-uninitialized -Wno-format -Wno-main
-
-.if empty(IDENT:M-DM68060)
-CMACHFLAGS=	-m68020
-.else
-CMACHFLAGS=	-m68060 -Wa,-m68030
-.endif
-CMACHFLAGS+=	-msoft-float -fno-stack-protector
-
-COPTS?=	-O2
-CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE}
-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"
-.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 "${M68K}/fpsp/Makefile.inc"
-
-### for the Motorola 68060 Software Support Package
-.include "${M68K}/060sp/Makefile.inc"
-
-# 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_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-
-.SUFFIXES: .o .g
-
-.g.o: ; echo This is a dummy rule and should not be executed.
-
-NORMAL_G=	gspa < $< | gspahextoc > $*.c; \
-		${CC} -c ${CFLAGS} ${CPPFLAGS} ${PROF} $*.c
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-# 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} ${060SP} \
-		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
-SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	@rm -f $@
-SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
-		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-LINKFLAGS+=	-X
-SYSTEM_LD_TAIL+=; \
-		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
-.else
-LINKFLAGS+=	-S
-.endif
-
-%LOAD
-
-assym.h: $S/kern/genassym.sh \
-	 ${M68K}/m68k/genassym.cf ${AMIGA}/amiga/genassym.cf Makefile
-	cat ${M68K}/m68k/genassym.cf ${AMIGA}/amiga/genassym.cf | \
-	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-	    > assym.h.tmp && \
-	mv -f assym.h.tmp assym.h
-
-param.c: $S/conf/param.c
-	rm -f param.c
-	cp $S/conf/param.c .
-
-param.o: param.c Makefile
-	${NORMAL_C}
-
-ioconf.o: ioconf.c
-	${NORMAL_C}
-
-newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-
-clean:: cleankernel
-cleankernel:
-	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
-	    [Ee]rrs linterrs makelinks assym.h
-
-lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${CFILES} ${AMIGA}/amiga/swapgeneric.c ioconf.c param.c | \
-	    grep -v 'static function .* unused'
-
-tags:
-	@echo "see $S/kern/Makefile for tags"
-
-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
-
-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}
-	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-	  ${CPPFLAGS} < ${AMIGA}/amiga/genassym.cf
-	@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
-	@rm -f assym.dep
-
-# depend on root or device configuration
-autoconf.o conf.o: Makefile
- 
-# depend on network or filesystem configuration 
-uipc_proto.o vfs_conf.o: Makefile 
-
-# depend on maxusers
-machdep.o: Makefile
-
-# depend on CPU configuration 
-amiga_init.o locore.o pmap.o sys_machdep.o bzsc.o flsc.o sbic.o sfas.o: Makefile
-
-
-locore.o: ${AMIGA}/amiga/locore.s assym.h
-	${NORMAL_S}
-
-# The install target can be redefined by putting a
-# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
-MACHINE_NAME!=  uname -n
-install: install-kernel-${MACHINE_NAME}
-.if !target(install-kernel-${MACHINE_NAME}})
-install-kernel-${MACHINE_NAME}:
-	rm -f /obsd
-	ln /bsd /obsd
-	cp bsd /nbsd
-	mv /nbsd /bsd
-.endif
-
-%RULES
diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK
deleted file mode 100644
index 444eaec4ff4..00000000000
--- a/sys/arch/amiga/conf/RAMDISK
+++ /dev/null
@@ -1,239 +0,0 @@
-#	$OpenBSD: RAMDISK,v 1.15 2002/08/03 08:55:35 pvalchev Exp $
-
-#
-# A ramdisk kernel
-#
-
-include "arch/amiga/conf/std.amiga"
-
-include "conf/GENERIC"
-rmoption	PTRACE
-
-maxusers	4
-
-#
-# mainboards to support (in addition to Amiga)
-#
-option		DRACO
-
-#
-# processors this kernel should support
-#
-option		"M68060"	# support for 060
-option		"M060SP"	# ...and MC68060 support package
-option		"M68040"	# support for 040
-option		FPSP		# MC68040 floating point support
-option		"M68030"	# support for 030
-option		"M68020"	# support for 020/851
-option		FPU_EMULATE	# FPU emulation
-
-#
-# File systems
-#
-option		ADOSFS		# AmigaDOS file system
-
-#
-# Compatibility options for various existing systems
-#
-#option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
-#option		COMPAT_HPUX	# HP300 compatibility
-
-#
-# Support for various kernel options
-#
-
-
-#
-# Misc. debugging options
-#
-#option		DEBUG		# Add debugging statements
-#option		SYSCALL_DEBUG	# debug all syscalls.
-#option		SCSIDEBUG	# Add SCSI debugging statements
-#option		PANICBUTTON	# Forced crash via keypress (???)
-
-#
-# Amiga specific options
-#
-# 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
-# on slower Amigas.  Try the larger buffers first then lev6_defer.
-#option		"SERIBUF_SIZE=4096"
-#option		"SEROBUF_SIZE=32"
-#option		LEV6_DEFER	# defers l6 to l4 (below serial l5)
-option		IPL_REMAP_1	# use remapping interruptsystem version 1
-#option		IPL_REMAP_2	# and version 2 (not yet done)
-
-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		CV64CONSOLE	# CyberVision console
-option		TSENGCONSOLE	# Tseng 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		"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 little 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
-# enables the Hardwarecursor which does not work on some systems.
-#option		RH_HARDWARECURSOR
-
-# Options for the ramdisk.
-option		MINIROOTSIZE=3584
-option		RAMDISK_HOOKS
-
-config		bsd root rd0 swap rd0
-
-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
-grfet*		at zbus0		# Tseng (oMniBus, Domino, Merlin)
-
-grf0		at grfcc0
-grf1		at grfrt0
-grf2		at grfrh0
-grf3		at grfcl?
-grf4		at grful0
-grf5		at grfcv0
-grf6		at grfet?
-
-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
-ite5		at grf5			# terminal emulators for grf's
-ite6		at grf6			# 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
-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		# A2091 scsi
-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 I,II scsi
-bztzsc0		at zbus0		# Blizzard 2060 scsi
-empsc0		at zbus0		# Emplant scsi
-drsc0		at mainbus0		# DraCo 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
-scsibus*	at bztzsc0
-scsibus*	at empsc0
-scsibus*	at drsc0
-
-# 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
-#ss*	at scsibus? target ? lun ?	# scsi scanners
-#ch*	at scsibus? target ? lun ?	# scsi autochangers
-#uk*	at scsibus? target ? lun ?	# scsi unknown
-
-ggbus*	at zbus0			# Goldengate bridge
-isa*	at ggbus?
-
-cross*	at zbus0			# CrossLink bridge
-isa*	at cross?
-
-#isapnp0	at isa?
-
-#com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
-#com1	at isa? port 0x2f8 irq 3
-#com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
-#com4	at isa? port 0x0f0 irq 11	# Crosslink builtin ports
-#com5	at isa? port 0x0f8 irq 10
-#ast0	at isa? port 0x1a0 irq 3	# AST 4-port serial cards
-#com*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-# option for using CD1400 handshaking for incoming data
-# requires a special cable that exchanges the RTS and DTR lines
-# options CY_HW_RTS
-# cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
-
-#lpt0	at isa? port 0x378 irq 7	# Standard PC parallel ports
-#lpt1	at isa? port 0x278
-#lpt2	at isa? port 0x3bc
-
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-#wdc1	at isa? port 0x170 irq ?
-wd*	at wdc? drive ?
-
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
-we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
-ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
-ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet cards
-#ne*	at isapnp?				# NE[12]000 PnP ethernet cards
-
-fd*	at fdc0 unit ?
-
-pseudo-device	view	1		# views
-pseudo-device	rd	1		# ramdisk
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
deleted file mode 100644
index b88c91a9948..00000000000
--- a/sys/arch/amiga/conf/files.amiga
+++ /dev/null
@@ -1,405 +0,0 @@
-#	$OpenBSD: files.amiga,v 1.49 2002/03/25 19:41:03 niklas Exp $
-#	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
-
-
-# maxpartitions must be first item in files.${ARCH}
-maxpartitions 16
-
-maxusers 2 8 64
-
-device	mainbus {}
-attach	mainbus at root
-
-device	cpu
-attach	cpu at mainbus
-
-# zorro expansion bus.
-device	zbus {}
-attach	zbus at mainbus
-file	arch/amiga/dev/zbus.c		zbus
-
-define	event {}
-file	arch/amiga/dev/event.c		event
-
-device	clock
-attach	clock at mainbus
-file	arch/amiga/dev/clock.c
-file	dev/clock_subr.c
-
-# joystick
-device	joy
-attach	joy at mainbus
-file	arch/amiga/dev/joy.c		joy needs-flag
-
-# A2000 internal hwc
-device	a2kbbc
-attach	a2kbbc at mainbus
-file	arch/amiga/dev/a2kbbc.c		a2kbbc
-
-# A3000/4000 internal hwc
-device	a34kbbc
-attach	a34kbbc at mainbus
-file	arch/amiga/dev/a34kbbc.c	a34kbbc
-
-# keyboard
-device	kbd: event
-attach	kbd at mainbus
-file	arch/amiga/dev/kbd.c		kbd needs-flag
-
-# serial port
-device	ser: tty
-attach	ser at mainbus
-file	arch/amiga/dev/ser.c		ser needs-count
-
-# parallel port
-device	par
-attach	par at mainbus
-file	arch/amiga/dev/par.c		par needs-count
-
-# audio
-device aucc: audio
-attach aucc at mainbus
-file   arch/amiga/dev/aucc.c		aucc needs-flag 
-
-# mouse
-device	ms: event
-attach	ms at mainbus
-file	arch/amiga/dev/ms.c		ms needs-flag
-
-# floppy
-device	fdc { unit = -1 }
-attach	fdc at mainbus
-
-device	fd
-attach	fd at fdc
-file	arch/amiga/dev/fd.c		fd needs-flag
-
-# graphic devices
-define	grfbus {}
-
-device	grf {}
-attach	grf at grfbus
-file	arch/amiga/dev/grf.c		grf needs-count
-
-device	ite
-attach	ite at grf
-file	arch/amiga/dev/ite.c		ite needs-flag
-file	arch/amiga/dev/kbdmap.c		ite
-file	arch/amiga/dev/ite_blank.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 (ite0 grf0)
-device	grfcc: grfbus
-attach	grfcc at mainbus
-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 ZII grf (ite1 grf1)
-device	grfrt: grfbus
-attach	grfrt at zbus
-file	arch/amiga/dev/grf_rt.c		grfrt needs-flag
-file	arch/amiga/dev/ite_rt.c		grfrt & ite
-
-# retina ZIII grf (it2 grf2)
-device	grfrh: grfbus
-attach	grfrh at zbus
-file	arch/amiga/dev/grf_rh.c		grfrh needs-flag
-file	arch/amiga/dev/ite_rh.c		grfrh & ite
-
-# cirrus grf (ite3 grf3)
-device	grfcl: grfbus
-attach	grfcl at zbus
-file	arch/amiga/dev/grf_cl.c		grfcl needs-flag
-file	arch/amiga/dev/ite_cl.c		grfcl & ite
-
-# A2410 grf (ite4 grf4)
-device	grful: grfbus
-attach	grful at zbus
-file	arch/amiga/dev/grf_ul.c		grful needs-flag
-file	arch/amiga/dev/ite_ul.c		grful & ite
-file	arch/amiga/dev/grf_ultms.g	grful
-
-# CyberVision 64 grf (ite5 grf5)
-device	grfcv: grfbus
-attach	grfcv at zbus
-file	arch/amiga/dev/grf_cv.c		grfcv needs-flag
-file	arch/amiga/dev/ite_cv.c		grfcv & ite
-
-# Tseng grf (ite6 grf6)
-device	grfet: grfbus
-attach	grfet at zbus
-file	arch/amiga/dev/grf_et.c		grfet needs-flag
-file	arch/amiga/dev/ite_et.c		grfet & ite
-
-# device defined in sys/conf/files
-# A2065, Ameristar ethernet cards
-attach	le at zbus with le_zbus
-file	arch/amiga/dev/if_le_zbus.c	le_zbus needs-flag
-
-# AriadneII ethernet card
-# device defined in sys/conf/files
-attach	ne at zbus with ne_zbus: rtl80x9
-file	arch/amiga/dev/if_ne_zbus.c	ne_zbus needs-flag
-
-# Hydra ethernet card
-device	ed:	ifnet, ether
-attach	ed at zbus with ed_zbus
-file	arch/amiga/dev/if_ed.c		ed_zbus needs-flag
-
-# C=/Ameristar A2060 / 560
-device	bah: ifnet, arc
-attach	bah at zbus with bah_zbus
-file	arch/amiga/dev/if_bah.c		bah_zbus needs-flag
-
-# CEI A4066 EthernetPLUS
-device	es:	ifnet, ether
-attach	es at zbus
-file	arch/amiga/dev/if_es.c		es needs-flag
-
-# Quicknet ethernet card
-device	qn:	ifnet, ether
-attach	qn at zbus
-file	arch/amiga/dev/if_qn.c		qn needs-flag
-
-# Ariadne ethernet card
-device	ae:	ifnet, ether
-attach	ae at zbus
-file	arch/amiga/dev/if_ae.c		ae needs-count
-
-# A2232 msc serial ports
-device	msc:	tty
-attach	msc at zbus
-file	arch/amiga/dev/msc.c		msc needs-count
-
-# bsc/Alf Data MultiFaceCard
-device	mfc { unit = -1 }
-attach	mfc at zbus
-
-device	mfcs
-attach	mfcs at mfc
-device	mfcp
-attach	mfcp at mfc
-file	arch/amiga/dev/mfc.c		mfcs | mfcp needs-count
-
-# DraCo superio chip
-define	supio {port = -1}
-
-device	drsupio: supio
-attach	drsupio at mainbus
-file	arch/amiga/dev/drsupio.c	drsupio
-
-include "../../../scsi/files.scsi"
-
-# handle gvp's odd autoconf info..
-device	gvpbus {}
-attach	gvpbus at zbus
-file	arch/amiga/dev/gvpbus.c		gvpbus
-
-# wd 33c93 controllers
-define	sbic 
-file	arch/amiga/dev/sbic.c		sbic
-
-# GVP series II
-device	gtsc: scsi, sbic
-attach	gtsc at gvpbus
-file	arch/amiga/dev/gtsc.c		gtsc needs-flag
-
-# Amiga 3000 internal
-device	ahsc: scsi, sbic
-attach	ahsc at mainbus
-file	arch/amiga/dev/ahsc.c		ahsc needs-flag
-
-# C= A2091
-device atzsc: scsi, sbic
-attach atzsc at zbus
-file	arch/amiga/dev/atzsc.c		atzsc needs-flag
-
-# ncr 5380 controllers
-define	sci
-file	arch/amiga/dev/sci.c		sci
-
-# Supra Wordsync II
-device	wstsc: scsi, sci
-attach	wstsc at zbus
-file	arch/amiga/dev/wstsc.c		wstsc needs-flag
-
-# IVS 
-device	ivsc: scsi, sci
-attach	ivsc at zbus
-file	arch/amiga/dev/ivsc.c		ivsc needs-flag
-
-# MLH
-device	mlhsc: scsi, sci
-attach	mlhsc at zbus
-file	arch/amiga/dev/mlhsc.c		mlhsc needs-flag
-
-# CSA twelve gauge.
-device	otgsc: scsi, sci
-attach	otgsc at zbus
-file	arch/amiga/dev/otgsc.c		otgsc needs-flag
-
-# ncr 57c710 controllers
-define	siop
-file	arch/amiga/dev/siop.c		siop
-
-# PPI Zeus
-device	zssc: scsi, siop
-attach	zssc at zbus
-file	arch/amiga/dev/zssc.c		zssc needs-flag
-
-# CSA Magnum
-device	mgnsc: scsi, siop
-attach	mgnsc at zbus
-file	arch/amiga/dev/mgnsc.c		mgnsc needs-flag
-
-# MacroSystems USA Warp Engine
-device	wesc: scsi, siop
-attach	wesc at zbus
-file	arch/amiga/dev/wesc.c		wesc needs-flag
-
-# C= A4091
-device	afsc: scsi, siop
-attach	afsc at zbus
-device	aftsc: scsi, siop
-attach	aftsc at mainbus
-file	arch/amiga/dev/afsc.c		afsc | aftsc needs-flag
-
-# Emulex ESP216 & FAS216 controllers
-define	sfas
-file	arch/amiga/dev/sfas.c		sfas
-
-# FastlaneZ3
-device	flsc: scsi, sfas
-attach	flsc at zbus
-file	arch/amiga/dev/flsc.c		flsc needs-flag
-
-# 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
-
-# EMPLANT
-device	empsc: scsi, sci
-attach	empsc at zbus
-file	arch/amiga/dev/empsc.c		empsc needs-flag
-
-# Amiga 4000/1200 IDE masquerading as SCSI
-device	idesc: scsi
-attach	idesc at mainbus
-file	arch/amiga/dev/idesc.c		idesc needs-flag
-
-# MacroSystem DraCo internal
-device	drsc: scsi, siop
-attach	drsc at mainbus
-file  arch/amiga/dev/drsc.c           drsc needs-flag
-
-# MacroSystem DraCo internal DS2404 hwc
-device	drbbc
-attach	drbbc at mainbus
-file	arch/amiga/dev/drbbc.c		drbbc
-
-#
-# Machine-independent ATAPI drivers
-#
-include "../../../dev/atapiscsi/files.atapiscsi"
-include "../../../dev/ata/files.ata"
-
-#
-# ISA devices
-#
-define	bridge {}
-
-# GoldenGate bridge
-device	ggbus: isabus
-attach	ggbus at zbus
-file	arch/amiga/isa/ggbus.c		ggbus needs-flag
-
-# CrossLink bridge
-device	cross: isabus
-attach	cross at zbus
-file	arch/amiga/isa/cross.c		cross needs-flag
-
-# XXX Dummy busses needed for some multi-homed devices specified in files.isa
-define	pci { }
-
-include	"../../../dev/isa/files.isa"
-file	arch/amiga/isa/isa_machdep.c	isabus
-
-# ISA PnP
-include "../../../dev/isa/files.isapnp"
-file	arch/amiga/isa/isapnp_machdep.c	isapnp
-
-# DraCo serial port
-attach	com at supio with com_supio
-file	arch/amiga/dev/com_supio.c	com_supio
-  
-# list of standard files...
-include	"arch/m68k/fpe/files.fpe"
-
-file	dev/cons.c
-file	dev/cninit.c
-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
-
-major	{wd = 0}
-major	{fd = 2}
-major	{sd = 4}
-major	{st = 5}
-major	{vnd = 6}
-major	{cd = 7}
-major	{ccd = 8}
-major	{rd = 16}
-
-# PCIC pcmcia controller
-# XXX this needs to be done very late, so it's done here.  This feels
-# like a kludge, but it might be for the best.
-
-device	pcic: pcmciabus
-file	dev/ic/i82365.c			pcic
-
-# PCIC pcmcia controller on ISA bus.
-attach	pcic at isa with pcic_isa
-file	dev/isa/i82365_isa.c		pcic_isa
-
-# PCIC pcmcia controller on PnP board
-#attach	pcic at isapnp with pcic_isapnp
-#file	dev/isa/i82365_isapnp.c	pcic_isapnp
-
-# Code common to ISA and ISAPnP attachments
-file	dev/isa/i82365_isasubr.c	pcic_isa | pcic_isapnp
-
-# this wants to be probed as late as possible.
-#
-# Machine-independent PCMCIA drivers
-#
-include "dev/pcmcia/files.pcmcia"
-
-#
-# Media Independent Interface (mii)
-#
-include "../../../dev/mii/files.mii"
diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga
deleted file mode 100644
index 9b2df8a6a29..00000000000
--- a/sys/arch/amiga/conf/std.amiga
+++ /dev/null
@@ -1,17 +0,0 @@
-#	$OpenBSD: std.amiga,v 1.5 1997/09/21 04:42:58 niklas Exp $
-#	$NetBSD: std.amiga,v 1.10 1996/12/20 19:15:06 veego Exp $
-
-# standard amiga information
-
-machine amiga m68k
-
-mainbus0	at root
-
-clock0	at mainbus0
-ser0	at mainbus0
-par0	at mainbus0
-kbd0	at mainbus0
-ms*	at mainbus0
-fdc0	at mainbus0
-fd*	at fdc0 unit ?
-zbus0	at mainbus0
diff --git a/sys/arch/amiga/conf/std.draco b/sys/arch/amiga/conf/std.draco
deleted file mode 100644
index 6b4b4f8beb5..00000000000
--- a/sys/arch/amiga/conf/std.draco
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$OpenBSD: std.draco,v 1.4 2001/10/10 23:43:42 millert Exp $
-#	$NetBSD: std.draco,v 1.2 1996/12/20 19:15:07 veego Exp $
-
-# standard DraCo information
-
-machine amiga m68k
-
-mainbus0	at root
-
-clock0	at mainbus0
-kbd0	at mainbus0
-zbus0	at mainbus0