[PoC 125/241] global: Migrate CONFIG_MXC_GPT_HCLK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/mach-imx/timer.c    | 4 ++--
 include/configs/brppt2.h     | 2 +-
 include/configs/mx6_common.h | 2 +-
 include/configs/mx7_common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index fcd45f09f181..792772b06473 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -54,7 +54,7 @@ static inline int gpt_has_clk_source_osc(void)
 
 static inline ulong gpt_get_clk(void)
 {
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc())
 		return MXC_HCLK >> 3;
 	else
@@ -78,7 +78,7 @@ int timer_init(void)
 	i = __raw_readl(&cur_gpt->control);
 	i &= ~GPTCR_CLKSOURCE_MASK;
 
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc()) {
 		i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN;
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 92f34407b401..47a95c0b920a 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_PL310_BASE		L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 /* MMC */
 
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 245530aa640b..1e99cdc7df4d 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -16,7 +16,7 @@
 #endif
 
 #endif
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index d5af6990107d..3a5917fed4b8 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,7 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 92dec899cad7..8aa247c62448 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -133,7 +133,7 @@ CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
-CONFIG_MXC_GPT_HCLK
+CFG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
-- 
2.25.1