svn commit: r291104 - in head/sys/arm: amlogic/aml8726 conf freescale/imx xilinx

[Andrew Turner]

Author: andrew
Date: Fri Nov 20 16:43:21 2015
New Revision: 291104
URL: https://svnweb.freebsd.org/changeset/base/291104

Log:
  Remove pl310.c from the SoC std.* files, it's in files.arm
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/amlogic/aml8726/files.aml8726
  head/sys/arm/conf/AML8726
  head/sys/arm/conf/IMX6
  head/sys/arm/conf/ZEDBOARD
  head/sys/arm/freescale/imx/files.imx6
  head/sys/arm/xilinx/files.zynq7

Modified: head/sys/arm/amlogic/aml8726/files.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/files.aml8726	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/amlogic/aml8726/files.aml8726	Fri Nov 20 16:43:21 2015	(r291104)
@@ -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

Modified: head/sys/arm/conf/AML8726
==============================================================================
--- head/sys/arm/conf/AML8726	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/conf/AML8726	Fri Nov 20 16:43:21 2015	(r291104)
@@ -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

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/conf/IMX6	Fri Nov 20 16:43:21 2015	(r291104)
@@ -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

Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/conf/ZEDBOARD	Fri Nov 20 16:43:21 2015	(r291104)
@@ -52,6 +52,8 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
+# Cache controller
+device		pl310			# PL310 L2 cache controller
 
 device		loop
 device		random

Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/freescale/imx/files.imx6	Fri Nov 20 16:43:21 2015	(r291104)
@@ -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

Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7	Fri Nov 20 16:18:27 2015	(r291103)
+++ head/sys/arm/xilinx/files.zynq7	Fri Nov 20 16:43:21 2015	(r291104)
@@ -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