[PoC 085/241] global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG

Tom Rini
2022-11-20T13:48:25Z

drivers/net/ti/keystone_net.c | 4 ++--
include/configs/ti_armv7_keystone2.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index db942811db76..5d344d73c3bc 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -372,12 +372,12 @@ static void keystone2_net_serdes_setup(void)
{
ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE,
&ks2_serdes_sgmii_156p25mhz,
- CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+ CFG_KSNET_SERDES_LANES_PER_SGMII);

#if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
&ks2_serdes_sgmii_156p25mhz,
- CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+ CFG_KSNET_SERDES_LANES_PER_SGMII);
#endif

/* wait till setup */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index c21fabc36ed5..cb4ea394eb8b 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -51,7 +51,7 @@
#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
+#define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES

/* EEPROM definitions */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 262995ea1f6a..980e6bc1d9b1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -93,7 +93,7 @@ CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
CFG_KSNET_NETCP_BASE
CFG_KSNET_NETCP_V1_0
CFG_KSNET_NETCP_V1_5
-CONFIG_KSNET_SERDES_LANES_PER_SGMII
+CFG_KSNET_SERDES_LANES_PER_SGMII
CONFIG_KSNET_SERDES_SGMII2_BASE
CONFIG_KSNET_SERDES_SGMII_BASE
CONFIG_L1_INIT_RAM
--
2.25.1