Retire zaurus, as it hasn't made the EABI jump and will be permanently broken

shortly when we use the hardware thread register in userland

4 files changed, 0 insertions, 651 deletions

diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
deleted file mode 100644
index 4d68c6aedae..00000000000
--- a/sys/arch/zaurus/conf/GENERIC
+++ /dev/null
@@ -1,229 +0,0 @@
-#	$OpenBSD: GENERIC,v 1.103 2016/06/28 04:41:37 jmatthew Exp $
-#
-# For further information on compiling OpenBSD kernels, see the config(8)
-# man page.
-#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page.  For further information about kernel options
-# for this architecture, see the options(4) man page.  For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-
-machine		zaurus arm
-include		"../../../conf/GENERIC"
-maxusers	32			# estimated number of users
-
-options		ARM32
-options		PXAGPIO_HAS_GPION_INTRS
-
-makeoptions	KERNEL_BASE_PHYS="0xa0200000"
-makeoptions	KERNEL_BASE_VIRT="0xc0200000"
-
-# CPU options
-options		CPU_XSCALE_PXA2X0	# Support the XScale core
-#options	XSCALE_CACHE_WRITE_THROUGH
-options		XSCALE_CACHE_WRITE_BACK
-makeoptions	CPUFLAGS="-mcpu=xscale"
-
-option	WSDISPLAY_COMPAT_USL		# VT handling
-option	WSDISPLAY_COMPAT_RAWKBD		# provide raw scancodes; needed for X11
-option	WSDISPLAY_DEFAULTSCREENS=2	# initial number of text consoles
-
-option USBVERBOSE
-
-config		bsd	swap generic
-
-# The main bus device
-mainbus0	at root
-cpu0		at mainbus?
-pxaip0		at mainbus?
-
-pxaintc0	at pxaip?		# interrupt controller
-pxagpio0	at pxaip?		# GPIO controller
-pxadmac0	at pxaip?		# DMA controller
-pxaost0		at pxaip? addr 0x40a00000 size 0x20
-
-# PCMCIA/CF socket and GPIO controllers
-scoop0		at pxaip?
-scoop1		at pxaip?
-
-# touch screen
-zts0		at pxaip?
-wsmouse*	at zts? mux 0
-
-# keyboard
-zkbd0		at pxaip?
-wskbd*		at zkbd? mux 1
-
-# USB controllers
-pxaudc0		at pxaip?		# USB Device Controller
-ohci0		at pxaip?		# Open Host Controller
-
-# USB function support
-usbf*		at pxaudc?		# USB logical device
-cdcef*		at usbf?		# CDC ethernet function
-
-# USB bus support
-usb*		at ohci?
-
-# USB devices
-uhub*		at usb?			# USB Root Hub
-uhub*		at uhub?		# USB Hub
-ualea*		at uhub?		# Araneus Alea II TRNG
-uonerng*	at uhub?		# Moonbase Otago OneRNG
-umodem*		at uhub?		# USB Modems/Serial
-ucom*		at umodem?
-uvisor*		at uhub?		# Handspring Visor
-ucom*		at uvisor?
-uvscom*		at uhub?		# SUNTAC Slipper U VS-10U serial
-ucom*		at uvscom?
-ubsa*		at uhub?		# Belkin serial adapter
-ucom*		at ubsa?
-uftdi*		at uhub?		# FTDI FT8U100AX serial adapter
-ucom*		at uftdi?
-uplcom*		at uhub?		# I/O DATA USB-RSAQ2 serial adapter
-ucom*		at uplcom?
-umct*		at uhub?		# MCT USB-RS232 serial adapter
-ucom*		at umct?
-uslcom*		at uhub?		# Silicon Laboratories CP210x serial
-ucom*		at uslcom?
-uark*		at uhub?		# Arkmicro ARK3116 serial
-ucom*		at uark?
-uipaq*		at uhub?		# iPAQ serial adapter
-ucom*		at uipaq?
-uchcom*		at uhub?		# WinChipHead CH341/340 serial
-ucom*		at uchcom?
-uaudio*		at uhub?		# USB Audio
-audio*		at uaudio?
-umidi*		at uhub?		# USB MIDI
-midi*		at umidi?
-ulpt*		at uhub?		# USB Printers
-umass*		at uhub?		# USB Mass Storage devices
-uhidev*		at uhub?		# Human Interface Devices
-ums*		at uhidev?		# USB mouse
-wsmouse*	at ums? mux 0
-ukbd*		at uhidev?		# USB keyboard
-wskbd*		at ukbd? mux 1
-ucycom*		at uhidev?		# Cypress serial
-ucom*		at ucycom?
-uslhcom*	at uhidev?		# Silicon Labs CP2110 USB HID UART
-ucom*		at uslhcom?
-uhid*		at uhidev?		# USB generic HID support
-upd*		at uhidev?		# USB Power Devices sensors
-aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
-atu*		at uhub?		# Atmel AT76C50x based 802.11b
-axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
-axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
-cue*		at uhub?		# CATC USB-EL1201A based Ethernet
-kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
-smsc*		at uhub?		# SMSC LAN95xx Ethernet
-cdce*		at uhub?		# CDC Ethernet
-urndis*		at uhub?		# Remote NDIS devices
-upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
-ugl*		at uhub?		# Genesys Logic GL620A-USB host-to-host
-udav*		at uhub?		# Davicom DM9601 based Ethernet
-ural*		at uhub?		# Ralink RT2500USB
-rum*		at uhub?		# Ralink RT2501USB/RT2601USB
-run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
-zyd*		at uhub?		# Zydas ZD1211
-url*		at uhub?		# Realtek RTL8150L based adapters
-ure*		at uhub?		# Realtek RTL8152 based adapters
-wi*		at uhub?		# WaveLAN IEEE 802.11DS
-udsbr*		at uhub?		# D-Link DSB-R100 radio
-radio*		at udsbr?		# USB radio
-ugen*		at uhub?		# USB Generic driver
-udcf*		at uhub?		# Gude Expert mouseCLOCK
-umbg*		at uhub?		# Meinberg Funkuhren USB5131
-uow*		at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
-onewire*	at uow?
-utwitch*	at uhidev?		# YUREX BBU sensor
-
-scsibus*	at scsi?
-sd*		at scsibus?		# SCSI disk drives
-#st*		at scsibus?		# SCSI tape drives
-cd*		at scsibus?		# SCSI CD-ROM drives
-#ch*		at scsibus?		# SCSI autochangers
-#uk*		at scsibus?		# unknown SCSI
-
-# integrated 16550 UARTs
-options COM_PXA2X0
-com0	at pxaip? addr 0x40100000 intr 22	# Full Function UART
-com1	at pxaip? addr 0x40200000 intr 21	# BlueTooth UART
-com2	at pxaip? addr 0x40700000 intr 20	# Standard UART (for IrDA)
-
-# integrated PCMCIA/CF controller
-pxapcic0	at pxaip?
-
-# PCMCIA bus support
-pcmcia*		at pxapcic?
-
-# PCMCIA (CF) devices
-com*		at pcmcia?		# PCMCIA modems/serial ports
-wi*		at pcmcia?		# WaveLAN IEEE 802.11DS
-malo*		at pcmcia?		# Marvell 88W8385
-ne*		at pcmcia?		# PCMCIA based NE2000 ethernet
-wdc*		at pcmcia?		# hard disk controller
-#cfxga*		at pcmcia?		# VoyagerVGA frame buffer
-#wsdisplay*	at cfxga?
-
-# IDE hard drives
-wd*		at wdc? flags 0x0000
-
-# Media Independent Interface (mii) drivers
-exphy*	at mii?				# 3Com internal PHYs
-inphy*	at mii?				# Intel 82555 PHYs
-iophy*	at mii?				# Intel 82553 PHYs
-icsphy*	at mii?				# ICS 1890 PHYs
-lxtphy*	at mii?				# Level1 LXT970 PHYs
-nsphy*	at mii?				# NS and compatible PHYs
-nsphyter* at mii?			# NS and compatible PHYs
-qsphy*	at mii?				# Quality Semi QS6612 PHYs
-sqphy*	at mii?				# Seeq 8x220 PHYs
-rlphy* at mii?				# Realtek 8139 internal PHYs
-mtdphy* at mii?				# Myson MTD972 PHYs
-#dcphy*	at mii?				# Digital Clone PHYs
-acphy*	at mii?				# Altima AC101 PHYs
-amphy*	at mii?				# AMD 79C873 PHYs
-tqphy*	at mii?				# TDK 78Q212x PHYs
-bmtphy*	at mii?				# Broadcom 10/100 PHYs
-#brgphy* at mii?			# Broadcom Gigabit PHYs
-eephy* at mii?				# Marvell 88E1000 series PHY
-#xmphy*	at mii?				# XaQti XMAC-II PHYs
-nsgphy*	at mii?				# NS gigabit PHYs
-urlphy*	at mii?				# Realtek RTL8150L internal PHY
-rgephy* at mii?				# Realtek 8169S/8110S PHY
-#ciphy* at mii?				# Cicada CS8201 10/100/1000 copper PHY
-ukphy*	at mii?				# "unknown" PHYs
-
-lcd0		at pxaip?		# LCD
-wsdisplay*	at lcd? console ?
-zssp0		at pxaip?		# ADC, touch screen, backlight
-apm0		at pxaip?		# APM emulation
-
-zaudio0		at pxaip?		# Zaurus I2S/I2C sound
-audio*		at zaudio?
-zrc0		at pxaip?		# Zaurus remote control
-wskbd*		at zrc? mux 1
-flash0		at pxaip?		# NAND flash memory
-
-pxammc0		at pxaip?		# MMC/SD/SDIO controller
-sdmmc*		at pxammc?		# SD/MMC bus
-
-# USB Video
-uvideo* at uhub?
-video*  at uvideo?
-
-utvfu*	at uhub?			# Fushicai Audio-Video Grabber
-video*	at utvfu?
-audio*	at utvfu?
-
-# 1-Wire devices
-option ONEWIREVERBOSE
-owid*	at onewire?			# ID
-owsbm*	at onewire?			# Smart Battery Monitor
-owtemp* at onewire?			# Temperature
-owctr*	at onewire?			# Counter device
-
-# Pseudo-Devices
-pseudo-device	wsmux		2	# mouse & keyboard multiplexor
-pseudo-device	hotplug		1	# devices hot plugging
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
deleted file mode 100644
index 29eb7b4dad7..00000000000
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ /dev/null
@@ -1,175 +0,0 @@
-#	$OpenBSD: Makefile.zaurus,v 1.55 2016/04/29 12:44:53 mpi Exp $
-
-# For instructions on building kernels consult the config(8) and options(4)
-# manual pages.
-#
-# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
-#	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
-# 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).
-
-.include <bsd.own.mk>
-
-SIZE?=	size
-STRIP?=	strip
-
-# source tree is located via $S relative to the compilation directory
-.ifndef S
-S!=	cd ../../../..; pwd
-.endif
-
-_machdir?=	$S/arch/${_mach}
-_archdir?=	$S/arch/${_arch}
-
-INCLUDES=	-nostdinc -I$S -I. -I$S/arch
-CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
-CWARNFLAGS=	-Werror -Wall -Wimplicit-function-declaration \
-		-Wno-main -Wno-uninitialized \
-		-Wframe-larger-than=2047
-
-CMACHFLAGS=	-ffreestanding -msoft-float # -march=armv4 -mtune=strongarm
-CMACHFLAGS+=	-fno-builtin-printf -fno-builtin-snprintf \
-		-fno-builtin-vsnprintf -fno-builtin-log \
-		-fno-builtin-log2 -fno-builtin-malloc ${NOPIE_FLAGS}
-.if ${IDENT:M-DNO_PROPOLICE}
-CMACHFLAGS+=	-fno-stack-protector
-.endif
-
-COPTS?=		-O2
-CFLAGS=		${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
-AFLAGS=		-D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS}
-LINKFLAGS=	-T ldscript --warn-common -nopie
-
-.if ${IDENT:M-DDDB_STRUCT}
-DB_STRUCTINFO=	db_structinfo.h
-.else
-DB_STRUCTINFO=
-.endif
-
-HOSTCC?=	${CC}
-HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
-HOSTED_CFLAGS=	${CFLAGS}
-HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
-
-NORMAL_C_NOP=	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
-NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -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_HEAD=	${_mach}_start.o locore.o param.o ioconf.o
-SYSTEM_OBJ=	${SYSTEM_HEAD} ${OBJS}
-SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	@rm -f $@
-SYSTEM_LD_HEAD+=; \
-		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
-		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-
-SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \
-		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS}
-SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@
-
-DEBUG?=
-.if ${DEBUG} == "-g"
-STRIPFLAGS=	-S
-SYSTEM_LD_TAIL+=; \
-		echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
-		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
-.else
-LINKFLAGS+=	-S
-.endif
-
-%LOAD
-
-# cc's -MD puts the source and output paths in the dependency file;
-# since those are temp files here we need to fix it up.  It also
-# puts the file in /tmp, so we use -MF to put it in the current
-# directory as assym.P and then generate assym.d from it with a
-# good target name
-assym.h: $S/kern/genassym.sh Makefile \
-	 ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf
-	cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
-	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} -MF assym.P > assym.h.tmp
-	sed '1s/.*/assym.h: \\/' assym.P > assym.d
-	sort -u 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}
-
-mcount.o: $S/lib/libkern/mcount.c Makefile
-	${NORMAL_C_NOP}
-
-ioconf.o: ioconf.c
-	${NORMAL_C}
-
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-
-clean::
-	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
-
-lint:
-	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${CFILES} ioconf.c param.c | \
-	    grep -v 'static function .* unused'
-
-depend:
-	@touch $@
-
-tags:
-	@echo "see $S/kern/Makefile for tags"
-
-db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl
-	${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c
-	objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@
-	rm -f db_structinfo.o
-
-${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S
-locore.o: ${_archdir}/${_arch}/locore.S assym.h
-in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
-vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h
-zaurus_start.o: assym.h
-
-# 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}:
-	cmp -s bsd /bsd || ln -f /bsd /obsd
-	cp bsd /nbsd
-	mv /nbsd /bsd
-.endif
-
-# pull in the dependency information
-.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO})
- ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
-.endif
-.ifnmake clean
-. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
-.  if exists(${o:R}.d)
-.   include "${o:R}.d"
-.  elif exists($o)
-    .PHONY: $o
-.  endif
-. endfor
-.endif
-
-%RULES
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
deleted file mode 100644
index 5fd3f586de2..00000000000
--- a/sys/arch/zaurus/conf/RAMDISK
+++ /dev/null
@@ -1,127 +0,0 @@
-#	$OpenBSD: RAMDISK,v 1.54 2016/06/28 04:41:37 jmatthew Exp $
-
-machine		zaurus arm
-maxusers	4
-
-option		TIMEZONE=0
-option		DST=0
-option		SMALL_KERNEL
-option		NO_PROPOLICE
-option		BOOT_CONFIG
-
-option		MINIROOTSIZE=5120
-option		RAMDISK_HOOKS
-
-option		FFS
-option		CD9660
-option		MSDOSFS
-option		INET6
-option		EXT2FS
-option		CRYPTO
-
-option		ARM32
-option		PXAGPIO_HAS_GPION_INTRS
-
-makeoptions	KERNEL_BASE_PHYS="0xa0200000"
-makeoptions	KERNEL_BASE_VIRT="0xc0200000"
-
-option		CPU_XSCALE_PXA2X0
-#option		XSCALE_CACHE_WRITE_THROUGH
-option		XSCALE_CACHE_WRITE_BACK
-makeoptions	CPUFLAGS="-mcpu=xscale"
-
-config		bsd root on rd0a swap on rd0b
-
-mainbus0	at root
-cpu0		at mainbus?
-pxaip0		at mainbus?
-pxaintc0	at pxaip?		# interrupt controller
-pxagpio0	at pxaip?
-scoop0		at pxaip?
-scoop1		at pxaip?
-pxaost0		at pxaip? addr 0x40a00000 size 0x20
-
-lcd0		at pxaip?
-wsdisplay*	at lcd? console ?
-zssp0		at pxaip?		# ADC, touch screen, backlight
-zts0		at pxaip?		# touch screen
-wsmouse*	at zts? mux 0
-zkbd0		at pxaip?
-wskbd*		at zkbd? mux 1
-pxaudc0		at pxaip?		# USB Device Controller
-
-ohci0		at pxaip?
-usbf*		at pxaudc?		# USB logical device
-cdcef*		at usbf?		# CDC ethernet function
-usb*		at ohci?
-
-uhub*		at usb?
-uhub*		at uhub?
-uhidev*		at uhub?
-uhid*		at uhidev?		# USB Generic HID devices
-ukbd*		at uhidev?		# USB HID Keyboard devices
-wskbd*		at ukbd? mux 1
-aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
-axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
-axen*		at uhub?		# ASIX Electronics AX88179 USB Ethernet
-cdce*		at uhub?		# CDC Ethernet
-cue*		at uhub?		# CATC USB-EL1201A based Ethernet
-kue*		at uhub?		# Kawasaki KL5KUSB101B based Ethernet
-smsc*		at uhub?		# SMSC LAN95xx Ethernet
-udav*		at uhub?		# Davicom DM9601 based Ethernet
-ural*		at uhub?		# Ralink RT2500
-url*		at uhub?		# Realtek RTL8150L based adapters
-ure*		at uhub?		# Realtek RTL8152 based adapters
-wi*		at uhub?		# WaveLAN IEEE 802.11DS
-upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
-ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
-umass*		at uhub?
-
-pxammc0		at pxaip?		# MMC/SD/SDIO controller
-sdmmc*		at pxammc?		# SD/MMC bus
-softraid0	at root
-
-scsibus*	at scsi?
-sd*		at scsibus?
-cd*		at scsibus?
-
-option		COM_PXA2X0
-com0		at pxaip? addr 0x40100000 intr 22	# Full Function UART
-com1		at pxaip? addr 0x40200000 intr 21	# BlueTooth UART
-com2		at pxaip? addr 0x40700000 intr 20	# Standard UART (for IrDA)
-
-pxapcic0	at pxaip?
-pcmcia*		at pxapcic?
-wi*		at pcmcia?
-ne*		at pcmcia?
-wdc*		at pcmcia?
-wd*		at wdc? flags 0x0000
-
-exphy*		at mii?			# 3Com internal PHYs
-inphy*		at mii?			# Intel 82555 PHYs
-iophy*		at mii?			# Intel 82553 PHYs
-icsphy*		at mii?			# ICS 1890 PHYs
-lxtphy*		at mii?			# Level1 LXT970 PHYs
-nsphy*		at mii?			# NS and compatible PHYs
-nsphyter*	at mii?			# NS and compatible PHYs
-qsphy*		at mii?			# Quality Semi QS6612 PHYs
-sqphy*		at mii?			# Seeq 8x220 PHYs
-rlphy*		at mii?			# Realtek 8139 internal PHYs
-mtdphy*		at mii?			# Myson MTD972 PHYs
-acphy*		at mii?			# Altima AC101 PHYs
-amphy*		at mii?			# AMD 79C873 PHYs
-tqphy*		at mii?			# TDK 78Q212x PHYs
-bmtphy*		at mii?			# Broadcom 10/100 PHYs
-eephy*		at mii?			# Marvell 88E1000 series PHY
-nsgphy*		at mii?			# NS gigabit PHYs
-urlphy*		at mii?			# Realtek RTL8150L internal PHY
-rgephy*		at mii?			# Realtek 8169S/8110S PHY
-ukphy*		at mii?			# "unknown" PHYs
-
-apm0		at pxaip?		# APM emulation
-
-pseudo-device	wsmux 2
-pseudo-device	loop 1
-pseudo-device	bpfilter 1
-pseudo-device	rd 1
-pseudo-device	bio 1
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
deleted file mode 100644
index b805fb9ab7b..00000000000
--- a/sys/arch/zaurus/conf/files.zaurus
+++ /dev/null
@@ -1,120 +0,0 @@
-#	$OpenBSD: files.zaurus,v 1.32 2016/01/08 15:54:13 jcs Exp $
-#
-# First try for arm-specific configuration info
-#
-
-maxpartitions	16
-maxusers	2 8 64
-
-major	{wd = 16}
-major	{sd = 24}
-major	{cd = 26}
-major	{rd = 18}
-
-file	arch/arm/arm/conf.c
-
-file	arch/zaurus/zaurus/zaurus_machdep.c
-
-#
-# Machine-independent SCSI drivers
-#
-include "scsi/files.scsi"
-include "dev/atapiscsi/files.atapiscsi"
-
-# CPU support and integrated peripherals
-include "arch/arm/xscale/files.pxa2x0"
-
-# LCD frame buffer
-attach lcd at pxaip with lcd_pxaip
-file arch/zaurus/zaurus/zaurus_lcd.c		lcd_pxaip
-
-# GPIO keyboard 
-device zkbd: wskbddev
-attach zkbd at pxaip
-file arch/zaurus/dev/zaurus_kbd.c		zkbd
-
-# 16-bit GPIO controller
-device scoop
-attach scoop at pxaip
-file arch/zaurus/dev/zaurus_scoop.c		scoop
-
-# PCMCIA/CF socket controller
-attach pxapcic at pxaip with pxapcic_scoop
-file arch/zaurus/dev/scoop_pcic.c		pxapcic_scoop
-
-# SD/MMC socket controller
-attach pxammc at pxaip with pxammc_scoop
-file arch/zaurus/dev/scoop_mmc.c		pxammc_scoop
-
-# Dedicated SSP unit for ADC, touch screen, and backlight
-device zssp
-attach zssp at pxaip
-file arch/zaurus/dev/zaurus_ssp.c		zssp
-
-# Power manager and APM emulation
-attach apm at pxaip with apm_pxaip
-file arch/zaurus/dev/zaurus_apm.c		apm_pxaip
-
-# Zaurus touchpad
-device zts: wsmousedev
-attach zts at pxaip
-file arch/zaurus/dev/zts.c			zts
-
-# Zaurus sound
-device	zaudio: audio, i2s, i2c
-attach	zaudio at pxaip
-file	arch/zaurus/dev/zaurus_audio.c		zaudio
-
-# Zaurus remote control
-device	zrc: wskbddev
-attach	zrc at pxaip
-file	arch/zaurus/dev/zaurus_remote.c		zrc
-
-# NAND flash pseudo-disk device (Xilinx NAND flash controller)
-device	flash: disk
-attach	flash at pxaip with flash_pxaip
-file	arch/zaurus/dev/zaurus_flash.c		flash_pxaip
-
-#
-# Machine-independent ATA drivers
-#
-include "dev/ata/files.ata"
-
-# Generic MD files
-file	arch/zaurus/zaurus/autoconf.c
-
-file	arch/arm/arm/disksubr.c			disk
-
-# ARM FPE
-file	arch/arm/fpe-arm/armfpe_glue.S		armfpe
-file	arch/arm/fpe-arm/armfpe_init.c		armfpe
-file	arch/arm/fpe-arm/armfpe.s		armfpe
-
-# Include WSCONS stuff
-include "dev/wscons/files.wscons"
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
-
-#
-# Machine-independent HID support
-#
-include	"dev/hid/files.hid"
-
-# Include USB stuff
-include "dev/usb/files.usb"
-
-attach pxaudc at pxaip with pxaudc_zaurus
-file arch/zaurus/dev/zaurus_udc.c		pxaudc_zaurus
-
-# Media Independent Interface (mii)
-include "dev/mii/files.mii"
-
-#
-# Machine-independent SD/MMC drivers
-#
-include "dev/sdmmc/files.sdmmc"
-
-#
-# Machine-independent 1-Wire drivers
-#
-include "dev/onewire/files.onewire"