aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2015-11-21 16:23:56 +0000
committerAndrew Turner <andrew@FreeBSD.org>2015-11-21 16:23:56 +0000
commited18006cbf23f8552e30620c404caf1baef73b6a (patch)
tree0684616dbe39867851ed945d2b39b3f716077f68
parent210d6af74da1582e9ae9661dc7e6cb78d8cb41dc (diff)
downloadsrc-ed18006cbf23f8552e30620c404caf1baef73b6a.tar.gz
src-ed18006cbf23f8552e30620c404caf1baef73b6a.zip
Create device options for the two common ARM timers.
Sponsored by: ABT Systems Ltd
Notes
Notes: svn path=/head/; revision=291135
Diffstat
-rw-r--r--sys/arm/altera/socfpga/files.socfpga2
-rw-r--r--sys/arm/broadcom/bcm2835/files.bcm28362
-rw-r--r--sys/arm/conf/EXYNOS5.common2
-rw-r--r--sys/arm/conf/IMX62
-rw-r--r--sys/arm/conf/PANDABOARD2
-rw-r--r--sys/arm/conf/RK31882
-rw-r--r--sys/arm/conf/RPI23
-rw-r--r--sys/arm/conf/SOCKIT.common2
-rw-r--r--sys/arm/conf/VIRT2
-rw-r--r--sys/arm/conf/VYBRID2
-rw-r--r--sys/arm/conf/ZEDBOARD2
-rw-r--r--sys/arm/freescale/imx/files.imx61
-rw-r--r--sys/arm/freescale/vybrid/files.vybrid2
-rw-r--r--sys/arm/qemu/files.qemu1
-rw-r--r--sys/arm/rockchip/files.rk30xx2
-rw-r--r--sys/arm/samsung/exynos/files.exynos52
-rw-r--r--sys/arm/ti/omap4/files.omap41
-rw-r--r--sys/arm/xilinx/files.zynq72
-rw-r--r--sys/conf/files.arm2
19 files changed, 21 insertions, 15 deletions
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 40890843236a..1b8aaa0f4504 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -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
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2836 b/sys/arm/broadcom/bcm2835/files.bcm2836
index 36f4d2499665..43b6b6c25c2d 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2836
+++ b/sys/arm/broadcom/bcm2835/files.bcm2836
@@ -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
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index 80c8677dafdf..c1fa16942325 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -87,6 +87,8 @@ device dwmmc
# Interrupt controller
device gic
+# ARM Generic Timer
+device generic_timer
# Pseudo devices
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 456196adcab7..7c267ff51bf9 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -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
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index fe62e8993655..3177900a7832 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -62,6 +62,8 @@ options DDB # Enable the kernel debugger
device fdt_pinctrl
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188
index 1c9d0addce09..246a66adb6ab 100644
--- a/sys/arm/conf/RK3188
+++ b/sys/arm/conf/RK3188
@@ -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
diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2
index 2e5b0549380c..cfbc14eca6a5 100644
--- a/sys/arm/conf/RPI2
+++ b/sys/arm/conf/RPI2
@@ -53,6 +53,9 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require
options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+# ARM Generic Timer
+device generic_timer
+
device bpf
device loop
device ether
diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common
index f30dca19089b..65be347e597b 100644
--- a/sys/arm/conf/SOCKIT.common
+++ b/sys/arm/conf/SOCKIT.common
@@ -53,6 +53,8 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require
# Interrupt controller
device gic
+# ARM MPCore timer
+device mpcore_timer
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT
index bbaa5d7f745a..aa70fd5d4062 100644
--- a/sys/arm/conf/VIRT
+++ b/sys/arm/conf/VIRT
@@ -46,6 +46,8 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require
# Interrupt controller
device gic
+# ARM Generic Timer
+device generic_timer
device bpf
device loop
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index ed04653b4b65..0aa38ce8624d 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -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
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index b3c42c640b85..6cdbf66c3253 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -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
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index b5271d5fc20e..45ff1a516315 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -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
diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid
index 20c1699033c2..75e80957a8c4 100644
--- a/sys/arm/freescale/vybrid/files.vybrid
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -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
diff --git a/sys/arm/qemu/files.qemu b/sys/arm/qemu/files.qemu
index 0ba925e9fe44..4f728c787335 100644
--- a/sys/arm/qemu/files.qemu
+++ b/sys/arm/qemu/files.qemu
@@ -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
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
index 721eb95636b1..274748a0e186 100644
--- a/sys/arm/rockchip/files.rk30xx
+++ b/sys/arm/rockchip/files.rk30xx
@@ -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
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index 589cc77f5e46..6791d5cfb85f 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -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
diff --git a/sys/arm/ti/omap4/files.omap4 b/sys/arm/ti/omap4/files.omap4
index 9f0fc76b9835..36e41fc5e502 100644
--- a/sys/arm/ti/omap4/files.omap4
+++ b/sys/arm/ti/omap4/files.omap4
@@ -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
diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7
index 008e0f7f02cc..a1292d00aa92 100644
--- a/sys/arm/xilinx/files.zynq7
+++ b/sys/arm/xilinx/files.zynq7
@@ -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
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index de23a6e353d7..bdc4a9c599c3 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 20:41:36 +0000