summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2015-10-15 01:51:10 +0000
committerbz <bz@FreeBSD.org>2015-10-15 01:51:10 +0000
commit9b00aa0101ef116656b80004aae21df78e1a01b9 (patch)
treec17ede7787161fb7f927572c59463918665ff13f /sys/conf
parentc8d3be347752a6f84988ff725b31cc84888cffa4 (diff)
downloadFreeBSD-src-9b00aa0101ef116656b80004aae21df78e1a01b9.zip
FreeBSD-src-9b00aa0101ef116656b80004aae21df78e1a01b9.tar.gz
2nd try, after r289319:
HWPMC depends on pmu.c even if device pmu is not specified. Would be great if we could just automatically enabled "device pmu" if we try to compile in HWPMC. Also several old kernel cnfigurations seem to have HWPMC enabled but are pre-FDT and thus fail. So make pmu.c depend on fdt in case of hwpmc as well. MFC after: 2 weeks Sponsored by: DARPA/AFRL Differential Revision: https://reviews.freebsd.org/D3877
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.arm2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 85830bb..a2abcc2 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -56,7 +56,7 @@ arm/arm/platform_if.m optional platform
arm/arm/pmap.c optional !armv6
arm/arm/pmap-v6.c optional armv6 !arm_new_pmap
arm/arm/pmap-v6-new.c optional armv6 arm_new_pmap
-arm/arm/pmu.c optional pmu
+arm/arm/pmu.c optional pmu | fdt hwpmc
arm/arm/sc_machdep.c optional sc
arm/arm/setcpsr.S standard
arm/arm/setstack.s standard
OpenPOWER on IntegriCloud