[PoC 223/241] global: Migrate CONFIG_UEC_ETH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/cpu.c              |  2 +-
 arch/powerpc/cpu/mpc8xxx/cpu.c              |  2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c |  2 +-
 drivers/qe/uec.c                            | 16 ++++++++--------
 include/configs/km/km-mpc83xx.h             |  2 +-
 scripts/config_whitelist.txt                |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd89..52d804cce19d 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -187,7 +187,7 @@ void watchdog_reset (void)
  */
 int cpu_eth_init(struct bd_info *bis)
 {
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	uec_standard_init(bis);
 #endif
 
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 7f2019092296..3ee6908f436b 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -351,7 +351,7 @@ int fixup_cpu(void)
  */
 int cpu_eth_init(struct bd_info *bis)
 {
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	uec_standard_init(bis);
 #endif
 
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index b9f519aba6e9..f9eea1ad9c58 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -402,7 +402,7 @@ int board_eth_init(struct bd_info *bis)
 
 	tsec_eth_init(bis, tsec_info, num);
 
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	/*  QE0 and QE3 need to be exposed for UCC1 and UCC5 Eth mode */
 	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE0);
 	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE3);
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 310887964352..feac4f701e60 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -27,28 +27,28 @@
 #endif
 
 static struct uec_inf uec_info[] = {
-#ifdef CONFIG_UEC_ETH1
+#ifdef CFG_UEC_ETH1
 	STD_UEC_INFO(1),	/* UEC1 */
 #endif
-#ifdef CONFIG_UEC_ETH2
+#ifdef CFG_UEC_ETH2
 	STD_UEC_INFO(2),	/* UEC2 */
 #endif
-#ifdef CONFIG_UEC_ETH3
+#ifdef CFG_UEC_ETH3
 	STD_UEC_INFO(3),	/* UEC3 */
 #endif
-#ifdef CONFIG_UEC_ETH4
+#ifdef CFG_UEC_ETH4
 	STD_UEC_INFO(4),	/* UEC4 */
 #endif
-#ifdef CONFIG_UEC_ETH5
+#ifdef CFG_UEC_ETH5
 	STD_UEC_INFO(5),	/* UEC5 */
 #endif
-#ifdef CONFIG_UEC_ETH6
+#ifdef CFG_UEC_ETH6
 	STD_UEC_INFO(6),	/* UEC6 */
 #endif
-#ifdef CONFIG_UEC_ETH7
+#ifdef CFG_UEC_ETH7
 	STD_UEC_INFO(7),	/* UEC7 */
 #endif
-#ifdef CONFIG_UEC_ETH8
+#ifdef CFG_UEC_ETH8
 	STD_UEC_INFO(8),	/* UEC8 */
 #endif
 };
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 3192ca7742a7..8e4d40dd7683 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -94,4 +94,4 @@
 /*
  * QE UEC ethernet configuration
  */
-#define CONFIG_UEC_ETH
+#define CFG_UEC_ETH
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ba5d1be700a3..83c7abfab261 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -237,7 +237,7 @@ CFG_UBI_PART
 CFG_UBOOTPATH
 CFG_UBOOT_SECTOR_COUNT
 CFG_UBOOT_SECTOR_START
-CONFIG_UEC_ETH
+CFG_UEC_ETH
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
-- 
2.25.1