[PoC 082/241] global: Migrate CONFIG_KSNET_NETCP_BASE to CFG

Tom Rini
2022-11-20T13:52:11Z

arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
include/configs/ti_armv7_keystone2.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index f191c909f41f..bedbcdc8bac6 100644
--- 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 e46d635ca032..c21fabc36ed5 100644
--- 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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 70296e18643b..7d609640e855 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -90,7 +90,7 @@ CFG_KM_UIMAGE_NAME
CFG_KSNET_CPSW_NUM_PORTS
CFG_KSNET_MAC_ID_BASE
CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
-CONFIG_KSNET_NETCP_BASE
+CFG_KSNET_NETCP_BASE
CONFIG_KSNET_NETCP_V1_0
CONFIG_KSNET_NETCP_V1_5
CONFIG_KSNET_SERDES_LANES_PER_SGMII
--
2.25.1