aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugen Hristev2020-11-11 18:46:03 +0200
committerEugen Hristev2020-11-26 10:12:47 +0200
commit6c5f79d0cec40b4637883d13c4312f08afeca5d3 (patch)
tree38b65b5d2bf32b7d6afcc2a60a05eaff08a73b58
parent62495e2cdb2e26f74281a0f7f0195b55e6d92abe (diff)
ARM: mach-at91: fix timer.o compile condition
The AT91 architecture now has two possible timer blocks, the old PIT timer and the new PIT64B. The timer.c file has an old non DM driver that works for platforms that do not use the ATMEL_PIT_TIMER DM-based driver. Update the Makefile to select this old driver in case neither of the ATMEL_PIT_TIMER and the MCHP_PIT64B_TIMER are selected. Suggested-by: Claudiu Beznea <claudiu.beznea@microchip.com> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
-rw-r--r--arch/arm/mach-at91/armv7/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile
index b46b90b28e1..f5b26659578 100644
--- a/arch/arm/mach-at91/armv7/Makefile
+++ b/arch/arm/mach-at91/armv7/Makefile
@@ -12,6 +12,9 @@ obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o clock.o
obj-$(CONFIG_SAMA7G5) += sama7g5_devices.o
obj-y += cpu.o
obj-y += reset.o
-ifeq ($(CONFIG_ATMEL_PIT_TIMER),)
+ifneq ($(CONFIG_ATMEL_PIT_TIMER),y)
+ifneq ($(CONFIG_MCHP_PIT64B_TIMER),y)
+# old non-DM timer driver
obj-y += timer.o
endif
+endif