diff options
| author | Michael Walle | 2022-08-17 21:37:50 +0200 |
|---|---|---|
| committer | Stefan Roese | 2022-08-23 12:38:54 +0200 |
| commit | 78c9b85df825f95c9b83a8d4b08c4ea75e8abc1a (patch) | |
| tree | b0007e7abe5e43e5214f9f362357b2cff8d9ea0a | |
| parent | f395cf9cacb1c54f95bce09473e37b8ac2b5517d (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>
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/config.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index 90e86ab99b4..d877be119fc 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -51,8 +51,10 @@ #endif /* CONFIG_IDE */ /* Use common timer */ +#ifndef CONFIG_TIMER #define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTER (MVEBU_TIMER_BASE + 0x14) #define CONFIG_SYS_TIMER_RATE CONFIG_SYS_TCLK +#endif #endif /* _KW_CONFIG_H */ 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 |