svn commit: r295885 - in head/sys/arm: allwinner allwinner/a20 altera/socfpga amlogic/aml8726 annapurna/alpine broadcom/bcm2835 conf freescale/imx freescale/vybrid mv/armadaxp qemu rockchip samsung...

Svatopluk Kraus skra at FreeBSD.org
Mon Feb 22 11:47:31 UTC 2016


Author: skra
Date: Mon Feb 22 11:47:28 2016
New Revision: 295885
URL: https://svnweb.freebsd.org/changeset/base/295885

Log:
  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.

Modified:
  head/sys/arm/allwinner/a20/std.a20
  head/sys/arm/allwinner/std.a10
  head/sys/arm/altera/socfpga/std.socfpga
  head/sys/arm/amlogic/aml8726/std.aml8726
  head/sys/arm/annapurna/alpine/std.alpine
  head/sys/arm/broadcom/bcm2835/std.bcm2836
  head/sys/arm/conf/std.armv6
  head/sys/arm/freescale/imx/std.imx51
  head/sys/arm/freescale/imx/std.imx53
  head/sys/arm/freescale/imx/std.imx6
  head/sys/arm/freescale/vybrid/std.vybrid
  head/sys/arm/mv/armadaxp/std.armadaxp
  head/sys/arm/qemu/std.virt
  head/sys/arm/rockchip/std.rk30xx
  head/sys/arm/samsung/exynos/std.exynos5250
  head/sys/arm/samsung/exynos/std.exynos5420
  head/sys/arm/ti/am335x/std.am335x
  head/sys/arm/ti/omap4/std.omap4
  head/sys/arm/xilinx/std.zynq7

Modified: head/sys/arm/allwinner/a20/std.a20
==============================================================================
--- head/sys/arm/allwinner/a20/std.a20	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/allwinner/a20/std.a20	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/allwinner/std.a10
==============================================================================
--- head/sys/arm/allwinner/std.a10	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/allwinner/std.a10	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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"

Modified: head/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/altera/socfpga/std.socfpga	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/amlogic/aml8726/std.aml8726	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- head/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/annapurna/alpine/std.alpine	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/broadcom/bcm2835/std.bcm2836
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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"

Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/conf/std.armv6	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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

Modified: head/sys/arm/freescale/imx/std.imx51
==============================================================================
--- head/sys/arm/freescale/imx/std.imx51	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/freescale/imx/std.imx51	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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

Modified: head/sys/arm/freescale/imx/std.imx53
==============================================================================
--- head/sys/arm/freescale/imx/std.imx53	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/freescale/imx/std.imx53	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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

Modified: head/sys/arm/freescale/imx/std.imx6
==============================================================================
--- head/sys/arm/freescale/imx/std.imx6	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/freescale/imx/std.imx6	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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

Modified: head/sys/arm/freescale/vybrid/std.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/freescale/vybrid/std.vybrid	Mon Feb 22 11:47:28 2016	(r295885)
@@ -7,6 +7,4 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
-options		ARM_L2_PIPT
-
 files		"../freescale/vybrid/files.vybrid"

Modified: head/sys/arm/mv/armadaxp/std.armadaxp
==============================================================================
--- head/sys/arm/mv/armadaxp/std.armadaxp	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/mv/armadaxp/std.armadaxp	Mon Feb 22 11:47:28 2016	(r295885)
@@ -2,5 +2,3 @@
 
 makeoptions	KERNVIRTADDR=0xc0200000
 options		KERNVIRTADDR=0xc0200000
-
-options		ARM_L2_PIPT

Modified: head/sys/arm/qemu/std.virt
==============================================================================
--- head/sys/arm/qemu/std.virt	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/qemu/std.virt	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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

Modified: head/sys/arm/rockchip/std.rk30xx
==============================================================================
--- head/sys/arm/rockchip/std.rk30xx	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/rockchip/std.rk30xx	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/samsung/exynos/std.exynos5250
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/samsung/exynos/std.exynos5250	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/samsung/exynos/std.exynos5420
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/samsung/exynos/std.exynos5420	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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
 

Modified: head/sys/arm/ti/am335x/std.am335x
==============================================================================
--- head/sys/arm/ti/am335x/std.am335x	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/ti/am335x/std.am335x	Mon Feb 22 11:47:28 2016	(r295885)
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_TI_AM335X
-
-options		ARM_L2_PIPT

Modified: head/sys/arm/ti/omap4/std.omap4
==============================================================================
--- head/sys/arm/ti/omap4/std.omap4	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/ti/omap4/std.omap4	Mon Feb 22 11:47:28 2016	(r295885)
@@ -7,5 +7,3 @@ options		KERNVIRTADDR=0xc0200000		# Used
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_OMAP4
-
-options		ARM_L2_PIPT

Modified: head/sys/arm/xilinx/std.zynq7
==============================================================================
--- head/sys/arm/xilinx/std.zynq7	Mon Feb 22 09:49:45 2016	(r295884)
+++ head/sys/arm/xilinx/std.zynq7	Mon Feb 22 11:47:28 2016	(r295885)
@@ -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


More information about the svn-src-all mailing list