aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSvatopluk Kraus <skra@FreeBSD.org>2016-02-22 11:47:28 +0000
committerSvatopluk Kraus <skra@FreeBSD.org>2016-02-22 11:47:28 +0000
commit7758916f4401f98c1812ecbfcaf2f8eef1670177 (patch)
tree22091a02af0d2e379c12f36d8a8ea1de73c939c9
parentb352b10400358a629fa59937c1ccd6f0e68bb196 (diff)
downloadsrc-7758916f4401f98c1812ecbfcaf2f8eef1670177.tar.gz
src-7758916f4401f98c1812ecbfcaf2f8eef1670177.zip
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.
Notes
Notes: svn path=/head/; revision=295885
Diffstat
-rw-r--r--sys/arm/allwinner/a20/std.a202
-rw-r--r--sys/arm/allwinner/std.a102
-rw-r--r--sys/arm/altera/socfpga/std.socfpga2
-rw-r--r--sys/arm/amlogic/aml8726/std.aml87262
-rw-r--r--sys/arm/annapurna/alpine/std.alpine2
-rw-r--r--sys/arm/broadcom/bcm2835/std.bcm28361
-rw-r--r--sys/arm/conf/std.armv62
-rw-r--r--sys/arm/freescale/imx/std.imx511
-rw-r--r--sys/arm/freescale/imx/std.imx531
-rw-r--r--sys/arm/freescale/imx/std.imx61
-rw-r--r--sys/arm/freescale/vybrid/std.vybrid2
-rw-r--r--sys/arm/mv/armadaxp/std.armadaxp2
-rw-r--r--sys/arm/qemu/std.virt1
-rw-r--r--sys/arm/rockchip/std.rk30xx2
-rw-r--r--sys/arm/samsung/exynos/std.exynos52502
-rw-r--r--sys/arm/samsung/exynos/std.exynos54202
-rw-r--r--sys/arm/ti/am335x/std.am335x2
-rw-r--r--sys/arm/ti/omap4/std.omap42
-rw-r--r--sys/arm/xilinx/std.zynq72
19 files changed, 2 insertions, 31 deletions
diff --git a/sys/arm/allwinner/a20/std.a20 b/sys/arm/allwinner/a20/std.a20
index cd72d2bae6b5..53cef037e460 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 24d359116832..8b8e2a3c14ae 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 8915fee9c2c8..687c5a7f7a22 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 61b515f75f9c..bd1c12e1c417 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 f66118b127e3..002b4ce5fa78 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 862be752338a..789450f4fab9 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 35f60a3345e7..142c7d3f7dfd 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 1c375fcc8157..4f9ac1454b9a 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 1c375fcc8157..4f9ac1454b9a 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 c7232a5c76b0..5c6c39c2f6b7 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 e45dd3fd4ebb..6baf9489ae0b 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 23e5423ff304..84361f53eb27 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 3adef1e0a355..858e195914ce 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 6d16291cb4da..431526b1c36e 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 b4d57b76301f..52e450823d74 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 b4d57b76301f..52e450823d74 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 994be2c97340..b5565c29df92 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 c8e456b78bc1..8d5764bbf52d 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 a5c6c577fa51..addf7bcb663c 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 13:33:18 +0000