summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2022-08-17 21:37:50 +0200
committerStefan Roese <sr@denx.de>2022-08-23 12:38:54 +0200
commit78c9b85df825f95c9b83a8d4b08c4ea75e8abc1a (patch)
treeb0007e7abe5e43e5214f9f362357b2cff8d9ea0a /arch/arm/mach-mvebu
parentf395cf9cacb1c54f95bce09473e37b8ac2b5517d (diff)
arm: kirkwood: make it CONFIG_TIMER aware
If we switch to CONFIG_TIMER, we don't need the legacy timer macros and functions anymore. Add the proper guards to exclude them from compiling. Cc: Pali Rohár <pali@kernel.org> Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 61eeb9c8c18..103e64cf204 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -15,7 +15,10 @@ ifdef CONFIG_ARCH_KIRKWOOD
obj-y = dram.o
obj-y += gpio.o
obj-y += mbus.o
+
+ifndef CONFIG_TIMER
obj-y += timer.o
+endif
else # CONFIG_ARCH_KIRKWOOD