From bc3cff9453943a388752f354c5e47d795cc47381 Mon Sep 17 00:00:00 2001
From: Adam Ford <aford173@gmail.com>
Date: Fri, 3 Jul 2020 08:27:12 -0500
Subject: [PATCH] Convert CONFIG_DRIVER_TI_EMAC_USE_RMII to Kconfig

This converts the following to Kconfig:
   CONFIG_DRIVER_TI_EMAC_USE_RMII

Signed-off-by: Adam Ford <aford173@gmail.com>
---
 configs/am3517_evm_defconfig     | 1 +
 drivers/net/ti/Kconfig           | 6 ++++++
 include/configs/am3517_evm.h     | 1 -
 include/configs/omapl138_lcdk.h  | 1 -
 include/configs/tam3517-common.h | 1 -
 scripts/config_whitelist.txt     | 1 -
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index f235978f30..833a55cb70 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -63,6 +63,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_DM_ETH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_EMAC=y
+CONFIG_DRIVER_TI_EMAC_USE_RMII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_DM_PMIC=y
diff --git a/drivers/net/ti/Kconfig b/drivers/net/ti/Kconfig
index ecf642de10..f2dbbd0128 100644
--- a/drivers/net/ti/Kconfig
+++ b/drivers/net/ti/Kconfig
@@ -14,6 +14,12 @@ config DRIVER_TI_EMAC
 	help
 	   Support for davinci emac
 
+config DRIVER_TI_EMAC_USE_RMII
+	depends on DRIVER_TI_EMAC
+	bool "Use RMII"
+	help
+	  Configure the TI EMAC driver to use RMII
+
 config DRIVER_TI_KEYSTONE_NET
 	bool "TI Keystone 2 Ethernet"
 	help
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index fc7d399e2e..0a35553da6 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -32,7 +32,6 @@
 /* I2C */
 
 /* Ethernet */
-#define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT		10
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 4404fef776..ad3bacb8f2 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -152,7 +152,6 @@
  * Network & Ethernet Configuration
  */
 #ifdef CONFIG_DRIVER_TI_EMAC
-#undef	CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index a98f944053..0787d39d55 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -117,7 +117,6 @@
  * ethernet support, EMAC
  *
  */
-#define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 90d6554f84..5d8d84d0f5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -331,7 +331,6 @@ CONFIG_DRIVER_DM9000
 CONFIG_DRIVER_EP93XX_MAC
 CONFIG_DRIVER_NE2000
 CONFIG_DRIVER_NE2000_BASE
-CONFIG_DRIVER_TI_EMAC_USE_RMII
 CONFIG_DSP_CLUSTER_START
 CONFIG_DWC2_DFLT_SPEED_FULL
 CONFIG_DWC2_DMA_BURST_SIZE
-- 
2.39.5