diff --git a/sys/arm/amlogic/aml8726/files.aml8726 b/sys/arm/amlogic/aml8726/files.aml8726
index 0f198aaa5ada..ebb42f762023 100644
--- a/sys/arm/amlogic/aml8726/files.aml8726
+++ b/sys/arm/amlogic/aml8726/files.aml8726
@@ -5,7 +5,6 @@ kern/kern_clocksource.c				standard
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 
-arm/arm/pl310.c					standard
 arm/amlogic/aml8726/aml8726_l2cache.c		standard
 
 arm/amlogic/aml8726/aml8726_machdep.c		standard
diff --git a/sys/arm/conf/AML8726 b/sys/arm/conf/AML8726
index 693dae522795..1c3d683077c5 100644
--- a/sys/arm/conf/AML8726
+++ b/sys/arm/conf/AML8726
@@ -61,6 +61,8 @@ device		mmcsd			# mmc/sd flash cards
 # Boot device is 2nd slice on MMC/SD card
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
+device		pl310			# PL310 L2 cache controller
+
 # GPIO
 device		gpio
 device		gpioled
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index cf2f34cdf376..456196adcab7 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -62,6 +62,8 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
+# Cache controller
+device		pl310			# PL310 L2 cache controller
 
 # Pseudo devices.
 device		loop			# Network loopback
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 7b378be8fb8f..b3c42c640b85 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -52,6 +52,8 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
+# Cache controller
+device		pl310			# PL310 L2 cache controller
 
 device		loop
 device		random
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 75df81d3dbfc..ba0fd46b8096 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -10,7 +10,6 @@ kern/kern_clocksource.c			standard
 #
 # Standard imx6 devices and support.
 #
-arm/arm/pl310.c				standard
 arm/arm/bus_space_base.c		standard
 arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7
index 90fa7ef8df40..24ccc2488052 100644
--- a/sys/arm/xilinx/files.zynq7
+++ b/sys/arm/xilinx/files.zynq7
@@ -10,7 +10,6 @@ arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 
 arm/arm/mpcore_timer.c				standard
-arm/arm/pl310.c					standard
 
 arm/xilinx/zy7_machdep.c			standard
 arm/xilinx/zy7_l2cache.c			standard