diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2018-01-02 15:41:58 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-03-21 09:40:48 +0100 |
| commit | e7a9e5a76b12ba9de4be6ba3507b6d0f541f7124 (patch) | |
| tree | d06116bc7059dd36d81a2dd01718495caef60b20 | |
| parent | 393811db8ea14d6f7d49bc6c13525cbb3ea799ac (diff) | |
imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/imx-common/Kconfig | 3 | ||||
| -rw-r--r-- | include/configs/mx7_common.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index fb00b8c67c..528506e3ce 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -3,6 +3,7 @@ if ARCH_MX7 config MX7 bool select ROM_UNIFIED_SECTIONS + select SYSCOUNTER_TIMER select CPU_V7_HAS_VIRT select CPU_V7_HAS_NONSEC select ARCH_SUPPORT_PSCI diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index f70aa30a91..5d949db641 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -4,6 +4,9 @@ config IMX_CONFIG config ROM_UNIFIED_SECTIONS bool +config SYSCOUNTER_TIMER + bool + config IMX_RDC bool "i.MX Resource domain controller driver" depends on ARCH_MX6 || ARCH_MX7 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 06452288ba..570bd8be16 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -19,7 +19,6 @@ /* Timer settings */ #define CONFIG_MXC_GPT_HCLK -#define CONFIG_SYSCOUNTER_TIMER #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define CONFIG_TIMER_CLK_FREQ CONFIG_SC_TIMER_CLK #define CONFIG_SYS_FSL_CLK diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 26a2524a49..724fcfc426 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4373,7 +4373,6 @@ CONFIG_SUVD3 CONFIG_SX151X_GPIO_COUNT_8 CONFIG_SX151X_SPI_BUS CONFIG_SXNI855T -CONFIG_SYSCOUNTER_TIMER CONFIG_SYSFLAGS_ADDR CONFIG_SYSFS CONFIG_SYSMGR_ISWGRP_HANDOFF |