diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2018-01-02 15:45:36 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-03-21 09:41:03 +0100 |
| commit | 88b1209ca920ee0b82f3dd18b69545e3c0dc9f90 (patch) | |
| tree | 72407f524952529c4d1609289ce9383dad354da8 /arch/arm | |
| parent | e7a9e5a76b12ba9de4be6ba3507b6d0f541f7124 (diff) | |
imx: introduce CONFIG_GPT_TIMER
Introduce a new config symbol to select the i.MX
General Purpose Timer (GPT).
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/imx-common/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig index 9f250c6b1e6..d07dac83b60 100644 --- a/arch/arm/cpu/armv7/mx5/Kconfig +++ b/arch/arm/cpu/armv7/mx5/Kconfig @@ -1,6 +1,7 @@ if ARCH_MX5 config MX5 + select GPT_TIMER bool default y diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index d5e6c83031c..0267dced191 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -1,6 +1,7 @@ if ARCH_MX6 config MX6 + select GPT_TIMER bool default y diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index 5d949db6414..124e0590cb5 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -7,6 +7,9 @@ config ROM_UNIFIED_SECTIONS config SYSCOUNTER_TIMER bool +config GPT_TIMER + bool + config IMX_RDC bool "i.MX Resource domain controller driver" depends on ARCH_MX6 || ARCH_MX7 diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index fca4d87975e..4924c6f21db 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -11,7 +11,8 @@ ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610)) obj-y = iomux-v3.o endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) -obj-y += timer.o cpu.o speed.o +obj-y += cpu.o speed.o +obj-$(CONFIG_GPT_TIMER) += timer.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs)) |