Move options INTRNG into std.armv6 and std.armv7

INTRNG is required on all armv6 and armv7 systems, so make it standard.
svn path=/head/; revision=338116
2018-08-20 20:31:53 +00:00 · 2018-08-20 20:31:53 +00:00 · 49a49b37df · 2020-12-20 02:59:44 +00:00
commit 49a49b37df
parent 10b070c166
22 changed files with 2 additions and 30 deletions
--- a/sys/arm/conf/ALPINE
+++ b/sys/arm/conf/ALPINE
@ -31,7 +31,6 @@ options 	PLATFORM

 # Interrupt controller
 device		gic
-options 	INTRNG

 # Annapurna Alpine drivers
 device		al_ccu			# Alpine Cache Coherency Unit
--- a/sys/arm/conf/ARMADA38X
+++ b/sys/arm/conf/ARMADA38X
@ -50,7 +50,6 @@ device		pci

 # Interrupt controllers
 device		gic
-options 	INTRNG

 # Timers
 device		mpcore_timer
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@ -18,7 +18,6 @@
 #
 # $FreeBSD$

-# TODO: Port to INTRNG
 #NO_UNIVERSE

 ident		MV-88F78XX0
@ -89,6 +88,4 @@ options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=db78460.dts

-options         INTRNG
-
 options 	PLATFORM
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@ -28,8 +28,6 @@ include 	"../ti/am335x/std.am335x"

 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"

-options 	INTRNG
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM

--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@ -131,5 +131,3 @@ options 	SC_DFLT_FONT		# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 device		ukbd			# Allow keyboard like HIDs to control console
 device		ums
-
-options 	INTRNG
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@ -73,7 +73,6 @@ device		dwmmc

 # Interrupt controller
 device		gic
-options 	INTRNG

 # ARM Generic Timer
 device		generic_timer
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@ -80,7 +80,6 @@ device		syscon
 device		cpufreq

 # Interrupt controller
-options 	INTRNG
 device		gic

 # PMU support (for CCNT).
--- a/sys/arm/conf/IMX53
+++ b/sys/arm/conf/IMX53
@ -119,5 +119,3 @@ device		wlan_amrr		# AMRR transmit rate control algorithm
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA="dtb/imx5 imx"
 device  	fdt_pinctrl		# FDT pinmux driver
-
-options 	INTRNG
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@ -22,8 +22,6 @@ ident		IMX6
 include 	"std.armv7"
 include 	"../freescale/imx/std.imx6"

-options 	INTRNG
-
 options 	SOC_IMX6

 options 	SCHED_ULE		# ULE scheduler
--- a/sys/arm/conf/ODROIDC1
+++ b/sys/arm/conf/ODROIDC1
@ -26,7 +26,6 @@ options 	SMP			# Enable multiple cores

 # Interrupt controller
 device		gic
-options 	INTRNG

 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=odroidc1.dts
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@ -46,7 +46,6 @@ options 	SMP			# Enable multiple cores
 device		fdt_pinctrl
 # Interrupt controller
 device		gic
-options 	INTRNG

 # ARM MPCore timer
 device		mpcore_timer
--- a/sys/arm/conf/RK3188
+++ b/sys/arm/conf/RK3188
@ -36,7 +36,6 @@ options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0\"

 # Interrupt controller
 device		gic
-options 	INTRNG

 # ARM MPCore timer
 device		mpcore_timer
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@ -24,8 +24,6 @@ include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2835"

-options 	INTRNG
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM

--- a/sys/arm/conf/RPI2
+++ b/sys/arm/conf/RPI2
@ -26,8 +26,6 @@ include 	"std.armv7"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"

-options 	INTRNG
-
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
--- a/sys/arm/conf/SOCFPGA
+++ b/sys/arm/conf/SOCFPGA
@ -42,7 +42,6 @@ options 	SOC_ALTERA_CYCLONE5

 # Interrupt controller
 device		gic
-options 	INTRNG

 # ARM MPCore timer
 device		mpcore_timer
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@ -68,7 +68,6 @@ makeoptions	SC_DFLT_FONT=cp437
 device		md
 device		random			# Entropy device

-options 	INTRNG
 options 	PLATFORM

 # Flattened Device Tree
--- a/sys/arm/conf/VSATV102
+++ b/sys/arm/conf/VSATV102
@ -26,7 +26,6 @@ options 	SMP			# Enable multiple cores

 # Interrupt controller
 device		gic
-options 	INTRNG

 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=vsatv102-m6.dts
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@ -47,7 +47,6 @@ options 	NO_SWAPPING

 # Interrupt controller
 device		gic
-options 	INTRNG

 # ARM MPCore timer
 device		mpcore_timer
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@ -41,7 +41,6 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"

 # Interrupt controller
 device		gic
-options 	INTRNG

 # Cache controller
 device		pl310			# PL310 L2 cache controller
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@ -4,6 +4,7 @@

 options 	HZ=1000
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@ -4,6 +4,7 @@

 options 	HZ=1000
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
@ -79,4 +80,3 @@ options 	USB_DEBUG		# Enable usb debug support code
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-
--- a/sys/arm/nvidia/tegra124/std.tegra124
+++ b/sys/arm/nvidia/tegra124/std.tegra124
@ -3,6 +3,4 @@ cpu 		CPU_CORTEXA
 machine		arm	armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"

-options		INTRNG
-
 files "../nvidia/tegra124/files.tegra124"