diff --git a/etc/etc.evbarm/Makefile.inc b/etc/etc.evbarm/Makefile.inc
index ffaf4b4aa385..83cd74d5769f 100644
--- a/etc/etc.evbarm/Makefile.inc
+++ b/etc/etc.evbarm/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.115 2020/05/18 21:19:34 jmcneill Exp $
+#	$NetBSD: Makefile.inc,v 1.116 2020/05/22 14:09:54 jmcneill Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -20,10 +20,8 @@ KERNEL_SETS.armv4+=		IXM1200
 EVBARM_BOARDS.xscale+=		ADI_BRH
 KERNEL_SETS.xscale+=		NSLU2
 
-EVBARM_BOARDS.armv7+=		BCM5301X
-EVBARM_BOARDS.armv7hf+=		BCM5301X
-#EVBARM_BOARDS.armv7+=		BCM56340
-#EVBARM_BOARDS.armv7hf+= 	BCM56340
+KERNEL_SETS.armv7+=		GENERIC
+KERNEL_SETS.armv7hf+=		GENERIC
 .else
 IMAGEENDIAN=	le
 # little endian boards
@@ -74,31 +72,8 @@ EVBARM_BOARDS.armv6+=		TISDP2420
 EVBARM_BOARDS.armv6hf+= 	TISDP2420
 #EVBARM_BOARDS.armv6+=		TISDP2430
 
-EVBARM_BOARDS.armv7+=		ARMADAXP
-EVBARM_BOARDS.armv7hf+=		ARMADAXP
-EVBARM_BOARDS.armv7+=		ARMADILLO-IOT-G3
-EVBARM_BOARDS.armv7hf+=		ARMADILLO-IOT-G3
-EVBARM_BOARDS.armv7+=		BCM5301X
-EVBARM_BOARDS.armv7hf+= 	BCM5301X
-#EVBARM_BOARDS.armv7+=		BCM56340
-#EVBARM_BOARDS.armv7hf+= 	BCM56340
-EVBARM_BOARDS.armv7+=		CUBOX
-EVBARM_BOARDS.armv7hf+= 	CUBOX
-EVBARM_BOARDS.armv7+=		CUBOX-I
-EVBARM_BOARDS.armv7hf+= 	CUBOX-I
-EVBARM_BOARDS.armv7+=		IMX6UL-STARTER
-EVBARM_BOARDS.armv7hf+=		IMX6UL-STARTER
-EVBARM_BOARDS.armv7+=		KOBO
-EVBARM_BOARDS.armv7hf+= 	KOBO
-EVBARM_BOARDS.armv7+=		MIRABOX
-EVBARM_BOARDS.armv7hf+=		MIRABOX
-EVBARM_BOARDS.armv7+=		NETWALKER
-EVBARM_BOARDS.armv7hf+=		NETWALKER
-EVBARM_BOARDS.armv7+=		OMAP5EVM
-EVBARM_BOARDS.armv7hf+=		OMAP5EVM
-EVBARM_BOARDS.armv7+=		PANDABOARD
-EVBARM_BOARDS.armv7hf+= 	PANDABOARD
-
+KERNEL_SETS.armv7+=		GENERIC
+KERNEL_SETS.armv7hf+=		GENERIC
 KERNEL_SETS.arm64+=		GENERIC64
 .endif
 
@@ -152,10 +127,6 @@ BUILD_KERNELS+=		${board}_INSTALL
 KERNEL_SETS+=		${KERNEL_SETS.${arch}}
 .endfor
 
-.if !empty(MACHINE_ARCH:Mearmv7*)
-KERNEL_SETS+=		GENERIC
-.endif
-
 .if !empty(MACHINE_ARCH:Maarch64)
 smp_efibootaa64:
 	cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release