Move ARM_L2_PIPT option to std.armv6 for all armv6 platforms.

Only L2 PIPT cache is supported for __ARM_ARCH >= 6.

In fact, this is just a pure proclamation as this option is used
only in armv4 specific files now.

19 files changed, 2 insertions, 31 deletions

diff --git a/sys/arm/allwinner/a20/std.a20 b/sys/arm/allwinner/a20/std.a20
index cd72d2b..53cef03 100644
--- a/sys/arm/allwinner/a20/std.a20
+++ b/sys/arm/allwinner/a20/std.a20
@@ -8,8 +8,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
diff --git a/sys/arm/allwinner/std.a10 b/sys/arm/allwinner/std.a10
index 24d3591..8b8e2a3 100644
--- a/sys/arm/allwinner/std.a10
+++ b/sys/arm/allwinner/std.a10
@@ -8,7 +8,5 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
-options 	ARM_L2_PIPT
-
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.a10"
diff --git a/sys/arm/altera/socfpga/std.socfpga b/sys/arm/altera/socfpga/std.socfpga
index 8915fee..687c5a7 100644
--- a/sys/arm/altera/socfpga/std.socfpga
+++ b/sys/arm/altera/socfpga/std.socfpga
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
diff --git a/sys/arm/amlogic/aml8726/std.aml8726 b/sys/arm/amlogic/aml8726/std.aml8726
index 61b515f..bd1c12e 100644
--- a/sys/arm/amlogic/aml8726/std.aml8726
+++ b/sys/arm/amlogic/aml8726/std.aml8726
@@ -17,8 +17,6 @@ device		fdt_pinctrl
 
 files		"../amlogic/aml8726/files.aml8726"
 
-options		ARM_L2_PIPT
-
 # Set all global interrupts to be edge triggered, active high.
 options		GIC_DEFAULT_ICFGR_INIT=0xffffffff
 
diff --git a/sys/arm/annapurna/alpine/std.alpine b/sys/arm/annapurna/alpine/std.alpine
index f66118b..002b4ce 100644
--- a/sys/arm/annapurna/alpine/std.alpine
+++ b/sys/arm/annapurna/alpine/std.alpine
@@ -10,8 +10,6 @@ options 	KERNVIRTADDR=0xa0200000
 makeoptions	KERNBASE=0xa0000000
 options 	KERNBASE=0xa0000000
 
-options 	ARM_L2_PIPT
-
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
diff --git a/sys/arm/broadcom/bcm2835/std.bcm2836 b/sys/arm/broadcom/bcm2835/std.bcm2836
index 862be75..789450f 100644
--- a/sys/arm/broadcom/bcm2835/std.bcm2836
+++ b/sys/arm/broadcom/bcm2835/std.bcm2836
@@ -5,7 +5,6 @@ cpu		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836
 
-options 	ARM_L2_PIPT
 options 	IPI_IRQ_START=76
 
 files	"../broadcom/bcm2835/files.bcm2836"
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index 35f60a3..142c7d3 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -2,6 +2,8 @@
 #
 # $FreeBSD$
 
+options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51
index 1c375fc..4f9ac14 100644
--- a/sys/arm/freescale/imx/std.imx51
+++ b/sys/arm/freescale/imx/std.imx51
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53
index 1c375fc..4f9ac14 100644
--- a/sys/arm/freescale/imx/std.imx53
+++ b/sys/arm/freescale/imx/std.imx53
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6
index c7232a5..5c6c39c 100644
--- a/sys/arm/freescale/imx/std.imx6
+++ b/sys/arm/freescale/imx/std.imx6
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000
diff --git a/sys/arm/freescale/vybrid/std.vybrid b/sys/arm/freescale/vybrid/std.vybrid
index e45dd3f..6baf948 100644
--- a/sys/arm/freescale/vybrid/std.vybrid
+++ b/sys/arm/freescale/vybrid/std.vybrid
@@ -7,6 +7,4 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 files		"../freescale/vybrid/files.vybrid"
diff --git a/sys/arm/mv/armadaxp/std.armadaxp b/sys/arm/mv/armadaxp/std.armadaxp
index 23e5423..84361f5 100644
--- a/sys/arm/mv/armadaxp/std.armadaxp
+++ b/sys/arm/mv/armadaxp/std.armadaxp
@@ -2,5 +2,3 @@
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options		KERNVIRTADDR=0xc0200000
-
-options		ARM_L2_PIPT
diff --git a/sys/arm/qemu/std.virt b/sys/arm/qemu/std.virt
index 3adef1e..858e195 100644
--- a/sys/arm/qemu/std.virt
+++ b/sys/arm/qemu/std.virt
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-options		ARM_L2_PIPT
 
 options 	KERNVIRTADDR		= 0xc1000000
 makeoptions	KERNVIRTADDR		= 0xc1000000
diff --git a/sys/arm/rockchip/std.rk30xx b/sys/arm/rockchip/std.rk30xx
index 6d16291..431526b 100644
--- a/sys/arm/rockchip/std.rk30xx
+++ b/sys/arm/rockchip/std.rk30xx
@@ -8,8 +8,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
diff --git a/sys/arm/samsung/exynos/std.exynos5250 b/sys/arm/samsung/exynos/std.exynos5250
index b4d57b7..52e4508 100644
--- a/sys/arm/samsung/exynos/std.exynos5250
+++ b/sys/arm/samsung/exynos/std.exynos5250
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
diff --git a/sys/arm/samsung/exynos/std.exynos5420 b/sys/arm/samsung/exynos/std.exynos5420
index b4d57b7..52e4508 100644
--- a/sys/arm/samsung/exynos/std.exynos5420
+++ b/sys/arm/samsung/exynos/std.exynos5420
@@ -7,8 +7,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
diff --git a/sys/arm/ti/am335x/std.am335x b/sys/arm/ti/am335x/std.am335x
index 994be2c..b5565c2 100644
--- a/sys/arm/ti/am335x/std.am335x
+++ b/sys/arm/ti/am335x/std.am335x
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_TI_AM335X
-
-options		ARM_L2_PIPT
diff --git a/sys/arm/ti/omap4/std.omap4 b/sys/arm/ti/omap4/std.omap4
index c8e456b..8d5764b 100644
--- a/sys/arm/ti/omap4/std.omap4
+++ b/sys/arm/ti/omap4/std.omap4
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_OMAP4
-
-options		ARM_L2_PIPT
diff --git a/sys/arm/xilinx/std.zynq7 b/sys/arm/xilinx/std.zynq7
index a5c6c57..addf7bc 100644
--- a/sys/arm/xilinx/std.zynq7
+++ b/sys/arm/xilinx/std.zynq7
@@ -12,7 +12,5 @@ files		"../xilinx/files.zynq7"
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15