[PoC 083/241] global: Migrate CONFIG_KSNET_NETCP_V1_0 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 drivers/net/ti/keystone_net.c                 | 2 +-
 include/configs/k2hk_evm.h                    | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index bedbcdc8bac6..1576a0473850 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -16,7 +16,7 @@
 #endif
 
 /* EMAC */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
@@ -120,7 +120,7 @@ struct mac_sl_cfg {
 #define DEVICE_CPSW_NUM_PORTS			CFG_KSNET_CPSW_NUM_PORTS
 #define DEVICE_N_GMACSL_PORTS			(DEVICE_CPSW_NUM_PORTS - 1)
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_CPSW_BASE			(GBETH_BASE + 0x800)
 #define CPSW_REG_CTL				0x004
@@ -166,7 +166,7 @@ struct mac_sl_cfg {
 #define SGMII_LINK_MAC_FIBER			3
 #define SGMII_LINK_MAC_PHY_FORCED		4
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 #define SGMII_OFFSET(x)		((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100))
 #elif defined CONFIG_KSNET_NETCP_V1_5
 #define SGMII_OFFSET(x)		((x) * 0x100)
@@ -188,7 +188,7 @@ struct mac_sl_cfg {
 #define RGMII_STATUS_REG		(GBETH_BASE + 0x18)
 
 /* PSS */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 1bdbd599d7b4..513c7b32521f 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -58,7 +58,7 @@ enum link_type {
 			 ((mac)[2] << 16) | ((mac)[3] << 24))
 #define mac_lo(mac)     (((mac)[4] << 0) | ((mac)[5] << 8))
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define EMAC_EMACSW_BASE_OFS		0x90800
 #define EMAC_EMACSW_PORT_BASE_OFS	(EMAC_EMACSW_BASE_OFS + 0x60)
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index e35f080279ae..600e73f11e78 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
+#define CFG_KSNET_NETCP_V1_0
 #define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7d609640e855..3861edb19315 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -91,7 +91,7 @@ CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
-CONFIG_KSNET_NETCP_V1_0
+CFG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
-- 
2.25.1