Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Attach mct early. Do not attach gtmr to mct.



details:   https://anonhg.NetBSD.org/src/rev/e00188e0d0ef
branches:  trunk
changeset: 324407:e00188e0d0ef
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Jul 02 12:53:51 2018 +0000

description:
Attach mct early. Do not attach gtmr to mct.

XXX gtmr still needed for setstatclock symbol

diffstat:

 sys/arch/arm/samsung/files.exynos |  4 ++--
 sys/arch/evbarm/conf/EXYNOS       |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r b25bc7cfb52f -r e00188e0d0ef sys/arch/arm/samsung/files.exynos
--- a/sys/arch/arm/samsung/files.exynos Mon Jul 02 12:49:37 2018 +0000
+++ b/sys/arch/arm/samsung/files.exynos Mon Jul 02 12:53:51 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.exynos,v 1.26 2018/07/01 23:28:40 jmcneill Exp $
+#      $NetBSD: files.exynos,v 1.27 2018/07/02 12:53:51 jmcneill Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -56,7 +56,7 @@
 file    arch/arm/samsung/exynos_rtc.c          exynos_rtc
 
 # Multi Core timer
-device mct { } : fdtbus, mpcorebus
+device mct
 attach mct at fdt with exyo_mct
 file   arch/arm/samsung/mct.c          exyo_mct
 
diff -r b25bc7cfb52f -r e00188e0d0ef sys/arch/evbarm/conf/EXYNOS
--- a/sys/arch/evbarm/conf/EXYNOS       Mon Jul 02 12:49:37 2018 +0000
+++ b/sys/arch/evbarm/conf/EXYNOS       Mon Jul 02 12:53:51 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: EXYNOS,v 1.26 2018/07/01 23:27:43 jmcneill Exp $
+#      $NetBSD: EXYNOS,v 1.27 2018/07/02 12:53:51 jmcneill Exp $
 #
 #      Samsung Exynos SoC kernel
 #
@@ -49,8 +49,9 @@
 gpiokeys*      at fdt?
 
 # Timer
-mct*           at fdt?                 # Exynos Multi Core Timer (MCT)
-armgtmr0       at mct?                 # ARM Generic Timer
+mct*           at fdt? pass 2          # Exynos Multi Core Timer (MCT)
+gtmr*          at fdt? pass 2
+armgtmr0       at gtmr?
 
 # Interrupt controller
 exyointr*      at fdt? pass 1



Home | Main Index | Thread Index | Old Index