On Wed, Jan 15, 2020 at 12:14:09PM +0100, Ahmad Fatoum wrote: > This reverts commit 33ec8cb5872617fa95aea08d9f7f2b684d95b6de, > so that barebox can once again match against "arm,armv7-timer" > compatibles. The reverted commit restricted the timer to CPU_V8, > because in i.MX multi-image configuration with MACH_SCB9328 set, > we can have both CPU_32v7 and CPU_32v4T in the same build. > > To avoid this issue properly, force use of -march=armv7-a for > non-CONFIG_CPU_V8 targets. This is acceptable as we don't expect > non-ARMv7 device trees to have the architected arm,armv7-timer. > > Suggested-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > drivers/clocksource/Kconfig | 2 +- > drivers/clocksource/Makefile | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) Applied, thanks > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index 44a6cef6fbae..43c5bfc9736a 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -73,7 +73,7 @@ config CLOCKSOURCE_ATMEL_PIT > config CLOCKSOURCE_ARMV8_TIMER > bool > default y > - depends on ARM && CPU_V8 > + depends on ARM && (CPU_64v8 || CPU_V7) Is it worth renaming the driver to something not v8 specific? ARM_ARCHITECTED_TIMER maybe? Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
