Convert CONFIG_KSNET_NETCP_V1_0 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_KSNET_NETCP_V1_0
   CONFIG_KSNET_NETCP_V1_5

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index b0069fd..2bcf226 100644 (file)
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -87,6 +87,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_KSNET_NETCP_V1_0=y
 CONFIG_PHY=y
 CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y

diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig
index 9ca26ae..94ab680 100644 (file)
--- a/configs/k2hk_hs_evm_defconfig
+++ b/configs/k2hk_hs_evm_defconfig
@@ -62,6 +62,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_KSNET_NETCP_V1_0=y
 CONFIG_PHY=y
 CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y

diff --git a/drivers/net/ti/Kconfig b/drivers/net/ti/Kconfig
index 59c96d8..e13dbc9 100644 (file)
--- a/drivers/net/ti/Kconfig
+++ b/drivers/net/ti/Kconfig
@@ -25,6 +25,19 @@ config DRIVER_TI_KEYSTONE_NET
        help
           This driver supports the TI Keystone 2 Ethernet subsystem
 
+choice
+       prompt "TI Keystone 2 Ethernet NETCP IP revision"
+       depends on DRIVER_TI_KEYSTONE_NET
+       default KSNET_NETCP_V1_5
+
+config KSNET_NETCP_V1_0
+       bool "NETCP version 1.0"
+
+config KSNET_NETCP_V1_5
+       bool "NETCP version 1.5"
+
+endchoice
+
 config TI_AM65_CPSW_NUSS
        bool "TI K3 AM65x MCU CPSW Nuss Ethernet controller driver"
        depends on ARCH_K3

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 174a91c..1283f45 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS    9
 
 #endif /* __CONFIG_K2E_EVM_H */

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index dc06d59..fd3708b 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -51,7 +51,6 @@
        "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS    2
 #define PHY_ANEG_TIMEOUT       10000 /* PHY needs longer aneg time */
 

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 68cbe98..36e3c59 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
 #define CONFIG_KSNET_CPSW_NUM_PORTS    5
 
 #endif /* __CONFIG_K2HK_EVM_H */

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 5d62945..cb7b036 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS    5
 
 #endif /* __CONFIG_K2L_EVM_H */