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

diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 85830bb6717c9343c91c2cab086e9c2be8ee2dc0..a2abcc243c543d3543c271634d695109553ee52b 100644 (file)
--- 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