| Message ID | 20201111164603.288797-1-eugen.hristev@microchip.com |
|---|---|
| State | Accepted |
| Commit | 6c5f79d0cec40b4637883d13c4312f08afeca5d3 |
| Delegated to: | Eugen Hristev |
| Headers | show |
| Series | ARM: mach-at91: fix timer.o compile condition | expand |
On 11.11.2020 18:46, Eugen Hristev wrote: > 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> > --- Applied to u-boot-atmel/master
diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile index b46b90b28e..f5b2665957 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
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> --- arch/arm/mach-at91/armv7/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)