svn commit: r291135 - in head/sys: arm/altera/socfpga arm/broadcom/bcm2835 arm/conf arm/freescale/imx arm/freescale/vybrid arm/qemu arm/rockchip arm/samsung/exynos arm/ti/omap4 arm/xilinx conf
Andrew Turner
andrew at FreeBSD.org
Sat Nov 21 16:23:59 UTC 2015
Author: andrew
Date: Sat Nov 21 16:23:56 2015
New Revision: 291135
URL: https://svnweb.freebsd.org/changeset/base/291135
Log:
Create device options for the two common ARM timers.
Sponsored by: ABT Systems Ltd
Modified:
head/sys/arm/altera/socfpga/files.socfpga
head/sys/arm/broadcom/bcm2835/files.bcm2836
head/sys/arm/conf/EXYNOS5.common
head/sys/arm/conf/IMX6
head/sys/arm/conf/PANDABOARD
head/sys/arm/conf/RK3188
head/sys/arm/conf/RPI2
head/sys/arm/conf/SOCKIT.common
head/sys/arm/conf/VIRT
head/sys/arm/conf/VYBRID
head/sys/arm/conf/ZEDBOARD
head/sys/arm/freescale/imx/files.imx6
head/sys/arm/freescale/vybrid/files.vybrid
head/sys/arm/qemu/files.qemu
head/sys/arm/rockchip/files.rk30xx
head/sys/arm/samsung/exynos/files.exynos5
head/sys/arm/ti/omap4/files.omap4
head/sys/arm/xilinx/files.zynq7
head/sys/conf/files.arm
Modified: head/sys/arm/altera/socfpga/files.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/files.socfpga Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/altera/socfpga/files.socfpga Sat Nov 21 16:23:56 2015 (r291135)
@@ -2,8 +2,6 @@
kern/kern_clocksource.c standard
-arm/arm/mpcore_timer.c standard
-
arm/altera/socfpga/socfpga_common.c standard
arm/altera/socfpga/socfpga_machdep.c standard
arm/altera/socfpga/socfpga_manager.c standard
Modified: head/sys/arm/broadcom/bcm2835/files.bcm2836
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2836 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2836 Sat Nov 21 16:23:56 2015 (r291135)
@@ -1,6 +1,4 @@
# $FreeBSD$
-arm/arm/generic_timer.c standard
-
arm/broadcom/bcm2835/bcm2836.c standard
arm/broadcom/bcm2835/bcm2836_mp.c optional smp
Modified: head/sys/arm/conf/EXYNOS5.common
==============================================================================
--- head/sys/arm/conf/EXYNOS5.common Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/EXYNOS5.common Sat Nov 21 16:23:56 2015 (r291135)
@@ -87,6 +87,8 @@ device dwmmc
# Interrupt controller
device gic
+# ARM Generic Timer
+device generic_timer
# Pseudo devices
Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/IMX6 Sat Nov 21 16:23:56 2015 (r291135)
@@ -64,6 +64,8 @@ options ROOTDEVNAME=\"ufs:mmcsd0s2a\"
device gic
# Cache controller
device pl310 # PL310 L2 cache controller
+# ARM MPCore timer
+device mpcore_timer
# Pseudo devices.
device loop # Network loopback
Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/PANDABOARD Sat Nov 21 16:23:56 2015 (r291135)
@@ -62,6 +62,8 @@ options DDB # Enable the kernel debug
device fdt_pinctrl
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/RK3188 Sat Nov 21 16:23:56 2015 (r291135)
@@ -47,6 +47,8 @@ options ROOTDEVNAME=\"ufs:/dev/mmcsd0\"
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
Modified: head/sys/arm/conf/RPI2
==============================================================================
--- head/sys/arm/conf/RPI2 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/RPI2 Sat Nov 21 16:23:56 2015 (r291135)
@@ -53,6 +53,9 @@ options INVARIANT_SUPPORT # Extra sanit
options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+# ARM Generic Timer
+device generic_timer
+
device bpf
device loop
device ether
Modified: head/sys/arm/conf/SOCKIT.common
==============================================================================
--- head/sys/arm/conf/SOCKIT.common Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/SOCKIT.common Sat Nov 21 16:23:56 2015 (r291135)
@@ -53,6 +53,8 @@ options INVARIANT_SUPPORT # Extra sanit
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
Modified: head/sys/arm/conf/VIRT
==============================================================================
--- head/sys/arm/conf/VIRT Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/VIRT Sat Nov 21 16:23:56 2015 (r291135)
@@ -46,6 +46,8 @@ options INVARIANT_SUPPORT # Extra sanit
# Interrupt controller
device gic
+# ARM Generic Timer
+device generic_timer
device bpf
device loop
Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/VYBRID Sat Nov 21 16:23:56 2015 (r291135)
@@ -62,6 +62,8 @@ options NO_SWAPPING
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/conf/ZEDBOARD Sat Nov 21 16:23:56 2015 (r291135)
@@ -54,6 +54,8 @@ options ROOTDEVNAME=\"ufs:mmcsd0s2a\"
device gic
# Cache controller
device pl310 # PL310 L2 cache controller
+# ARM MPCore timer
+device mpcore_timer
device loop
device random
Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/freescale/imx/files.imx6 Sat Nov 21 16:23:56 2015 (r291135)
@@ -8,7 +8,6 @@ kern/kern_clocksource.c standard
#
# Standard imx6 devices and support.
#
-arm/arm/mpcore_timer.c standard
arm/freescale/fsl_ocotp.c standard
arm/freescale/imx/imx6_anatop.c standard
arm/freescale/imx/imx6_ccm.c standard
Modified: head/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/freescale/vybrid/files.vybrid Sat Nov 21 16:23:56 2015 (r291135)
@@ -2,8 +2,6 @@
kern/kern_clocksource.c standard
-arm/arm/mpcore_timer.c standard
-
arm/freescale/vybrid/vf_machdep.c standard
arm/freescale/vybrid/vf_common.c standard
arm/freescale/vybrid/vf_ccm.c standard
Modified: head/sys/arm/qemu/files.qemu
==============================================================================
--- head/sys/arm/qemu/files.qemu Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/qemu/files.qemu Sat Nov 21 16:23:56 2015 (r291135)
@@ -8,7 +8,6 @@ kern/kern_clocksource.c standard
#
# Standard qemu virt devices and support.
#
-arm/arm/generic_timer.c standard
arm/qemu/virt_common.c standard
arm/qemu/virt_machdep.c standard
arm/qemu/virt_mp.c optional smp
Modified: head/sys/arm/rockchip/files.rk30xx
==============================================================================
--- head/sys/arm/rockchip/files.rk30xx Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/rockchip/files.rk30xx Sat Nov 21 16:23:56 2015 (r291135)
@@ -1,8 +1,6 @@
# $FreeBSD$
kern/kern_clocksource.c standard
-arm/arm/mpcore_timer.c standard
-
arm/rockchip/rk30xx_common.c standard
arm/rockchip/rk30xx_machdep.c standard
arm/rockchip/rk30xx_pmu.c standard
Modified: head/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- head/sys/arm/samsung/exynos/files.exynos5 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/samsung/exynos/files.exynos5 Sat Nov 21 16:23:56 2015 (r291135)
@@ -2,8 +2,6 @@
kern/kern_clocksource.c standard
-arm/arm/generic_timer.c standard
-
arm/samsung/exynos/exynos5_mct.c standard
arm/samsung/exynos/exynos5_mp.c optional smp
arm/samsung/exynos/exynos5_common.c standard
Modified: head/sys/arm/ti/omap4/files.omap4
==============================================================================
--- head/sys/arm/ti/omap4/files.omap4 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/ti/omap4/files.omap4 Sat Nov 21 16:23:56 2015 (r291135)
@@ -1,6 +1,5 @@
#$FreeBSD$
-arm/arm/mpcore_timer.c standard
arm/ti/ti_smc.S standard
arm/ti/usb/omap_ehci.c optional usb ehci
Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7 Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/arm/xilinx/files.zynq7 Sat Nov 21 16:23:56 2015 (r291135)
@@ -5,8 +5,6 @@
kern/kern_clocksource.c standard
-arm/arm/mpcore_timer.c standard
-
arm/xilinx/zy7_machdep.c standard
arm/xilinx/zy7_l2cache.c standard
arm/xilinx/zy7_slcr.c standard
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Sat Nov 21 16:21:27 2015 (r291134)
+++ head/sys/conf/files.arm Sat Nov 21 16:23:56 2015 (r291135)
@@ -39,6 +39,7 @@ arm/arm/fiq.c standard
arm/arm/fiq_subr.S standard
arm/arm/fusu.S standard
arm/arm/gdb_machdep.c optional gdb
+arm/arm/generic_timer.c optional generic_timer
arm/arm/gic.c optional gic
arm/arm/identcpu.c standard
arm/arm/in_cksum.c optional inet | inet6
@@ -50,6 +51,7 @@ arm/arm/machdep.c standard
arm/arm/mem.c optional mem
arm/arm/minidump_machdep.c optional mem
arm/arm/mp_machdep.c optional smp
+arm/arm/mpcore_timer.c optional mpcore_timer
arm/arm/nexus.c standard
arm/arm/physmem.c standard
arm/arm/pic_if.m optional arm_intrng
More information about the svn-src-all
mailing list