diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-01-15 12:14:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-01-16 10:43:52 +0100 |
| commit | 8dab02ec4dfbac3b1d818a8605dba4be94630dd3 (patch) | |
| tree | 2e53266ebfc0e70e021ea73654e6a06f4a035c22 /drivers/clocksource | |
| parent | dd96bc73d798d1c92c0dc903e6e8ce9b368e17aa (diff) | |
| download | barebox-8dab02ec4dfbac3b1d818a8605dba4be94630dd3.tar.gz barebox-8dab02ec4dfbac3b1d818a8605dba4be94630dd3.tar.xz | |
Revert "clocksource: ARMv8 timer can only be built on ARMv8"
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@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/clocksource/Makefile | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 44a6cef6fb..43c5bfc973 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) config CLOCKSOURCE_ARM_GLOBAL_TIMER bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index f8ff83d60a..8dbf91f323 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -12,8 +12,11 @@ obj-$(CONFIG_CLOCKSOURCE_UEMD) += uemd.o obj-$(CONFIG_CLOCKSOURCE_ROCKCHIP)+= rk_timer.o obj-$(CONFIG_CLOCKSOURCE_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_CLOCKSOURCE_ARMV8_TIMER) += armv8-timer.o +ifneq ($(CONFIG_CPU_V8),y) +CFLAGS_armv8-timer.o := -march=armv7-a +endif obj-$(CONFIG_CLOCKSOURCE_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_CLOCKSOURCE_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLOCKSOURCE_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_CLOCKSOURCE_TI_DM) += timer-ti-dm.o -obj-$(CONFIG_CLOCKSOURCE_TI_32K) += timer-ti-32k.o
\ No newline at end of file +obj-$(CONFIG_CLOCKSOURCE_TI_32K) += timer-ti-32k.o |