imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index e687048b3122b0cd763040423bf4b7e6463332e1..653819123c7ff5f1b7db9bb59d7832e04bcd498e 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -7,6 +7,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/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 4f8b4e138e3d9c99adcd97b980d79b2ecfe0c129..2a3db860bbcfeb7314a395dba61f37ee277d0c4e 100644 (file)
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/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/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 16e4d95ff47de948e41cebb582df88b4c22cc352..17850400c1fd6384eaf2f4ec8d9db55bab1a814d 100644 (file)
--- 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 COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
 #define CONFIG_SYS_FSL_CLK

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c82065e8a155ea695c1df82b9b99d895a4222753..a27dc4fc3822f1d8f406b8229bab39832a76cdca 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2220,7 +2220,6 @@ CONFIG_SUPPORT_RAW_INITRD
 CONFIG_SUPPORT_VFAT
 CONFIG_SUVD3
 CONFIG_SXNI855T
-CONFIG_SYSCOUNTER_TIMER
 CONFIG_SYSFLAGS_ADDR
 CONFIG_SYSFS
 CONFIG_SYSMGR_ISWGRP_HANDOFF