global: Migrate CONFIG_KSNET_NETCP_BASE to CFG

Perform a simple rename of CONFIG_KSNET_NETCP_BASE to CFG_KSNET_NETCP_BASE

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

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index f191c90..bedbcdc 100644 (file)
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -18,7 +18,7 @@
 /* EMAC */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define GBETH_BASE                     (CONFIG_KSNET_NETCP_BASE + 0x00090000)
+#define GBETH_BASE                     (CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR          (GBETH_BASE + 0x900)
 #define EMAC_MDIO_BASE_ADDR            (GBETH_BASE + 0x300)
 #define EMAC_SGMII_BASE_ADDR           (GBETH_BASE + 0x100)
@@ -32,7 +32,7 @@
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define GBETH_BASE                     (CONFIG_KSNET_NETCP_BASE + 0x00200000)
+#define GBETH_BASE                     (CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP                0x020
 #define EMAC_EMACSL_BASE_ADDR          (GBETH_BASE + 0x22000)
 #define EMAC_MDIO_BASE_ADDR            (GBETH_BASE + 0x00f00)
@@ -190,14 +190,14 @@ struct mac_sl_cfg {
 /* PSS */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR    (CONFIG_KSNET_NETCP_BASE + 0x604)
+#define DEVICE_PSTREAM_CFG_REG_ADDR    (CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI      0x06060606
 #define hw_config_streaming_switch()\
        writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR    (CONFIG_KSNET_NETCP_BASE + 0x500)
+#define DEVICE_PSTREAM_CFG_REG_ADDR    (CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI      0x0
 
 #define hw_config_streaming_switch()\

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index e46d635..c21fabc 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -48,7 +48,7 @@
 
 /* Keystone net */
 #define CFG_KSNET_MAC_ID_BASE          KS2_MAC_ID_BASE_ADDR
-#define CONFIG_KSNET_NETCP_BASE                        KS2_NETCP_BASE
+#define CFG_KSNET_NETCP_BASE                   KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE         KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE                KS2_SGMII_SERDES2_BASE
 #define CONFIG_KSNET_SERDES_LANES_PER_SGMII    KS2_LANES_PER_SGMII_SERDES