diff --git a/sys/arch/evbarm/conf/HUMMINGBIRD_A31 b/sys/arch/evbarm/conf/HUMMINGBIRD_A31
deleted file mode 100644
index 10e8db27e169..000000000000
--- a/sys/arch/evbarm/conf/HUMMINGBIRD_A31
+++ /dev/null
@@ -1,141 +0,0 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.28 2017/03/20 14:06:43 skrll Exp $
-#
-#	HUMMINGBIRD_A31 - Merrii Hummingbird A31
-#
-
-include	"arch/evbarm/conf/std.awin"
-include "arch/evbarm/conf/GENERIC.common"
-
-no makeoptions	CPUFLAGS
-makeoptions	CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
-no makeoptions	BOARDTYPE
-makeoptions	BOARDTYPE="hummingbird_a31"
-
-# CPU options
-options 	MULTIPROCESSOR
-options 	MEMSIZE=1024
-options 	ALLWINNER_A31
-options 	AWIN_CONSOLE_EARLY
-options 	AWIN_GPIO_IGNORE_FW
-
-#options 	DIAGNOSTIC	# internal consistency checks
-#options 	DEBUG
-#options 	VERBOSE_INIT_ARM # verbose bootstraping messages
-makeoptions	DEBUG="-g"	# compile full symbol table
-makeoptions	COPY_SYMTAB=1
-
-config		netbsd		root on ? type ?
-
-mainbus0	at root
-cpu*		at mainbus?
-
-# A7 core devices
-armperiph0	at mainbus?
-armgic0		at armperiph?				# Interrupt Controller
-armgtmr0	at armperiph?				# ARM Generic Timer
-
-# SoC I/O
-awinio0		at mainbus?
-
-# SD/MMC controllers
-awinmmc0	at awinio0 port 0
-sdmmc*		at awinmmc?
-ld*		at sdmmc?
-
-# Interrupt Controller
-awinicu0	at awinio0 
-
-# DMA Controller
-awindma0	at awinio0
-
-# 64-bit counter
-awincnt0	at awinio0
-
-# GPIO Controller
-awingpio0	at awinio0
-
-gpio*		at awingpio?
-
-# I2C Controllers
-#awiniic0	at awinio? port 0
-#iic0		at awiniic0
-
-awiniic2	at awinio? port 2
-iic2		at awiniic2
-pcf8563rtc0	at iic2 addr 0x51	# PCF8563 RTC
-
-# P2WI
-awinp2wi0	at awinio0
-iic1		at awinp2wi0
-axp22x0		at iic1 addr 0x34	# AXP221 Power Management Unit	
-
-# On-board 16550 UARTs
-com0		at awinio? port 0			# UART0 (console)
-options 	CONADDR=0x01c28000, CONSPEED=115200
-
-# Consumer IR
-awinir0		at awinio?
-cir0		at awinir0
-
-# Watchdog timers
-awinwdt*	at awinio?
-
-# RTC (not battery backed on this board; use PCF8563 instead)
-#awinrtc*	at awinio?
-
-# onboard audio codec
-awinac0		at awinio0
-audio0		at awinac0
-
-# GMAC Ethernet
-awge0		at awinio0 port ?
-
-# HDMI
-awinhdmi0	at awinio0
-awinhdmiaudio0	at awinio0
-audio1		at awinhdmiaudio0
-
-spkr*		at audio?		# PC speaker (synthesized)
-
-# TCON
-awintcon0	at awinio0 port 0
-
-# DE-BE
-awindebe0	at awinio0 port 0
-
-# Framebuffer
-genfb0		at awindebe0
-wsdisplay*	at genfb?
-options 	VCONS_DRAW_INTR
-options 	WSEMUL_VT100
-options 	WS_KERNEL_FG=WSCOL_GREEN
-options 	WS_KERNEL_BG=WSCOL_BLACK
-options 	WSDISPLAY_COMPAT_PCVT
-options 	WSDISPLAY_COMPAT_SYSCONS
-options 	WSDISPLAY_COMPAT_USL
-options 	WSDISPLAY_COMPAT_RAWKBD
-options 	WSDISPLAY_DEFAULTSCREENS=4
-pseudo-device	wsmux
-pseudo-device	wsfont
-
-# On-board USB
-awinusb0	at awinio0 port 0
-awinusb1	at awinio0 port 1
-ohci*		at awinusb?
-ehci*		at awinusb?
-usb*		at ohci?
-usb*		at ehci?
-
-# USB OTG
-#motg0		at awinio0
-#usb*		at motg?
-
-include "dev/usb/usbdevices.config"
-
-midi*		at midibus?
-
-rlphy*		at mii? phy ?
-rgephy* 	at mii? phy ?
-ukphy*		at mii? phy ?
-
-cinclude "arch/evbarm/conf/HUMMINGBIRD_A31.local"
diff --git a/sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL b/sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL
deleted file mode 100644
index 0181ab41412a..000000000000
--- a/sys/arch/evbarm/conf/HUMMINGBIRD_A31_INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-#	$NetBSD: HUMMINGBIRD_A31_INSTALL,v 1.3 2014/10/14 17:48:24 htodd Exp $
-#
-#       HUMMINGBIRD_A31_INSTALL -- Merrii Hummingbird A31 kernel with
-#	installation-sized ramdisk
-#
-
-include "arch/evbarm/conf/HUMMINGBIRD_A31"
-include "arch/evbarm/conf/INSTALL"
-
-options 	BOOTHOWTO=RB_SINGLE
-#makeoption 	DEBUG