summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2018-01-02 15:49:36 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-03-21 09:41:10 +0100
commitf05c11cd42b97c29fb17e08cd953410775ed780a (patch)
treefda8505a00202332501fee57c1083b2529753468 /arch/arm/cpu
parent88b1209ca920ee0b82f3dd18b69545e3c0dc9f90 (diff)
imx: initialize and use generic timer on i.MX 6UL/ULL
The i.MX 6UL/ULL feature a Cortex-A7 CPU which suppor the ARM generic timer. This change makes use of the ARM generic timer in U-Boot. This is crucial to make the ARM generic timers usable in Linux since timer_init() initalizes the system counter module, which is necessary to use the generic timers CP15 registers. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/mx6/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 0267dced19..51377e22a7 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -1,7 +1,7 @@
if ARCH_MX6
config MX6
- select GPT_TIMER
+ select GPT_TIMER if !MX6UL && !MX6ULL
bool
default y
@@ -30,6 +30,7 @@ config MX6SX
config MX6UL
select SYS_L2CACHE_OFF
select ROM_UNIFIED_SECTIONS
+ select SYSCOUNTER_TIMER
bool
config MX6ULL