Module Name: src
Committed By: jmcneill
Date: Wed Dec 5 21:43:33 UTC 2018
Modified Files:
src/sys/arch/aarch64/conf: files.aarch64
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/fdt: files.fdt
Log Message:
Split armv7/armv8 tprof backend config logic from the fdt bus glue.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/conf/files.aarch64
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/fdt/files.fdt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.10 src/sys/arch/aarch64/conf/files.aarch64:1.11
--- src/sys/arch/aarch64/conf/files.aarch64:1.10 Sun Nov 18 15:52:03 2018
+++ src/sys/arch/aarch64/conf/files.aarch64 Wed Dec 5 21:43:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.aarch64,v 1.10 2018/11/18 15:52:03 skrll Exp $
+# $NetBSD: files.aarch64,v 1.11 2018/12/05 21:43:33 jmcneill Exp $
defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK
defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -137,3 +137,6 @@ file arch/aarch64/aarch64/netbsd32_sysca
#file arch/aarch64/aarch64/linux_sigcode.S compat_linux
#file arch/aarch64/aarch64/linux_syscall.c compat_linux
#file arch/aarch64/aarch64/linux_trap.c compat_linux
+
+# profiling support
+file dev/tprof/tprof_armv8.c tprof
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.146 src/sys/arch/arm/conf/files.arm:1.147
--- src/sys/arch/arm/conf/files.arm:1.146 Sun Oct 28 10:21:42 2018
+++ src/sys/arch/arm/conf/files.arm Wed Dec 5 21:43:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.146 2018/10/28 10:21:42 jmcneill Exp $
+# $NetBSD: files.arm,v 1.147 2018/12/05 21:43:33 jmcneill Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
@@ -249,3 +249,6 @@ include "compat/linux/arch/arm/files.lin
file arch/arm/arm/linux_sigcode.S compat_linux
file arch/arm/arm/linux_syscall.c compat_linux
file arch/arm/arm/linux_trap.c compat_linux
+
+# profiling support
+file dev/tprof/tprof_armv7.c tprof
Index: src/sys/arch/arm/fdt/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.27 src/sys/arch/arm/fdt/files.fdt:1.28
--- src/sys/arch/arm/fdt/files.fdt:1.27 Fri Oct 12 22:20:48 2018
+++ src/sys/arch/arm/fdt/files.fdt Wed Dec 5 21:43:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.27 2018/10/12 22:20:48 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.28 2018/12/05 21:43:33 jmcneill Exp $
include "dev/pckbport/files.pckbport"
@@ -58,11 +58,9 @@ device pcihost: pcibus
attach pcihost at fdt with pcihost_fdt
file arch/arm/fdt/pcihost_fdt.c pcihost_fdt
-device armpmu
+device armpmu: tprof
attach armpmu at fdt with pmu_fdt
file arch/arm/fdt/pmu_fdt.c pmu_fdt
-file dev/tprof/tprof_armv7.c pmu_fdt & arm32
-file dev/tprof/tprof_armv8.c pmu_fdt & aarch64
attach genfb at fdt with plfb_fdt: fdt_display_timing
file arch/arm/fdt/plfb_fdt.c plfb_fdt
