Author: imp Date: Mon Aug 20 20:31:53 2018 New Revision: 338116 URL: https://svnweb.freebsd.org/changeset/base/338116
Log: Move options INTRNG into std.armv6 and std.armv7 INTRNG is required on all armv6 and armv7 systems, so make it standard. Modified: head/sys/arm/conf/ALPINE head/sys/arm/conf/ARMADA38X head/sys/arm/conf/ARMADAXP head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/GENERIC head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI-B head/sys/arm/conf/RPI2 head/sys/arm/conf/SOCFPGA head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VSATV102 head/sys/arm/conf/VYBRID head/sys/arm/conf/ZEDBOARD head/sys/arm/conf/std.armv6 head/sys/arm/conf/std.armv7 head/sys/arm/nvidia/tegra124/std.tegra124 Modified: head/sys/arm/conf/ALPINE ============================================================================== --- head/sys/arm/conf/ALPINE Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/ALPINE Mon Aug 20 20:31:53 2018 (r338116) @@ -31,7 +31,6 @@ options PLATFORM # Interrupt controller device gic -options INTRNG # Annapurna Alpine drivers device al_ccu # Alpine Cache Coherency Unit Modified: head/sys/arm/conf/ARMADA38X ============================================================================== --- head/sys/arm/conf/ARMADA38X Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/ARMADA38X Mon Aug 20 20:31:53 2018 (r338116) @@ -50,7 +50,6 @@ device pci # Interrupt controllers device gic -options INTRNG # Timers device mpcore_timer Modified: head/sys/arm/conf/ARMADAXP ============================================================================== --- head/sys/arm/conf/ARMADAXP Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/ARMADAXP Mon Aug 20 20:31:53 2018 (r338116) @@ -18,7 +18,6 @@ # # $FreeBSD$ -# TODO: Port to INTRNG #NO_UNIVERSE ident MV-88F78XX0 @@ -88,7 +87,5 @@ device pci options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=db78460.dts - -options INTRNG options PLATFORM Modified: head/sys/arm/conf/BEAGLEBONE ============================================================================== --- head/sys/arm/conf/BEAGLEBONE Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/BEAGLEBONE Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/EFIKA_MX Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/EXYNOS5.common ============================================================================== --- head/sys/arm/conf/EXYNOS5.common Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/EXYNOS5.common Mon Aug 20 20:31:53 2018 (r338116) @@ -73,7 +73,6 @@ device dwmmc # Interrupt controller device gic -options INTRNG # ARM Generic Timer device generic_timer Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/GENERIC Mon Aug 20 20:31:53 2018 (r338116) @@ -80,7 +80,6 @@ device syscon device cpufreq # Interrupt controller -options INTRNG device gic # PMU support (for CCNT). Modified: head/sys/arm/conf/IMX53 ============================================================================== --- head/sys/arm/conf/IMX53 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/IMX53 Mon Aug 20 20:31:53 2018 (r338116) @@ -119,5 +119,3 @@ device wlan_amrr # AMRR transmit rate control algori options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA="dtb/imx5 imx" device fdt_pinctrl # FDT pinmux driver - -options INTRNG Modified: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/IMX6 Mon Aug 20 20:31:53 2018 (r338116) @@ -22,8 +22,6 @@ ident IMX6 include "std.armv7" include "../freescale/imx/std.imx6" -options INTRNG - options SOC_IMX6 options SCHED_ULE # ULE scheduler Modified: head/sys/arm/conf/ODROIDC1 ============================================================================== --- head/sys/arm/conf/ODROIDC1 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/ODROIDC1 Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/PANDABOARD ============================================================================== --- head/sys/arm/conf/PANDABOARD Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/PANDABOARD Mon Aug 20 20:31:53 2018 (r338116) @@ -46,7 +46,6 @@ options SMP # Enable multiple cores device fdt_pinctrl # Interrupt controller device gic -options INTRNG # ARM MPCore timer device mpcore_timer Modified: head/sys/arm/conf/RK3188 ============================================================================== --- head/sys/arm/conf/RK3188 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/RK3188 Mon Aug 20 20:31:53 2018 (r338116) @@ -36,7 +36,6 @@ options ROOTDEVNAME=\"ufs:/dev/mmcsd0\" # Interrupt controller device gic -options INTRNG # ARM MPCore timer device mpcore_timer Modified: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/RPI-B Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/RPI2 ============================================================================== --- head/sys/arm/conf/RPI2 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/RPI2 Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/SOCFPGA ============================================================================== --- head/sys/arm/conf/SOCFPGA Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/SOCFPGA Mon Aug 20 20:31:53 2018 (r338116) @@ -42,7 +42,6 @@ options SOC_ALTERA_CYCLONE5 # Interrupt controller device gic -options INTRNG # ARM MPCore timer device mpcore_timer Modified: head/sys/arm/conf/VERSATILEPB ============================================================================== --- head/sys/arm/conf/VERSATILEPB Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/VERSATILEPB Mon Aug 20 20:31:53 2018 (r338116) @@ -68,7 +68,6 @@ makeoptions SC_DFLT_FONT=cp437 device md device random # Entropy device -options INTRNG options PLATFORM # Flattened Device Tree Modified: head/sys/arm/conf/VSATV102 ============================================================================== --- head/sys/arm/conf/VSATV102 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/VSATV102 Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/VYBRID ============================================================================== --- head/sys/arm/conf/VYBRID Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/VYBRID Mon Aug 20 20:31:53 2018 (r338116) @@ -47,7 +47,6 @@ options NO_SWAPPING # Interrupt controller device gic -options INTRNG # ARM MPCore timer device mpcore_timer Modified: head/sys/arm/conf/ZEDBOARD ============================================================================== --- head/sys/arm/conf/ZEDBOARD Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/ZEDBOARD Mon Aug 20 20:31:53 2018 (r338116) @@ -41,7 +41,6 @@ options ROOTDEVNAME=\"ufs:mmcsd0s2a\" # Interrupt controller device gic -options INTRNG # Cache controller device pl310 # PL310 L2 cache controller Modified: head/sys/arm/conf/std.armv6 ============================================================================== --- head/sys/arm/conf/std.armv6 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/std.armv6 Mon Aug 20 20:31:53 2018 (r338116) @@ -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 Modified: head/sys/arm/conf/std.armv7 ============================================================================== --- head/sys/arm/conf/std.armv7 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/std.armv7 Mon Aug 20 20:31:53 2018 (r338116) @@ -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 - Modified: head/sys/arm/nvidia/tegra124/std.tegra124 ============================================================================== --- head/sys/arm/nvidia/tegra124/std.tegra124 Mon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/nvidia/tegra124/std.tegra124 Mon Aug 20 20:31:53 2018 (r338116) @@ -3,6 +3,4 @@ cpu CPU_CORTEXA machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a" -options INTRNG - files "../nvidia/tegra124/files.tegra124" _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
