[PoC 217/241] global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 15:17:19 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/net/tsec.c           | 8 ++++----
 include/configs/P1010RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 734e10c563e0..7ad690a1c875 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -57,14 +57,14 @@ static struct tsec_info_struct tsec_info[] = {
 		)
 
 /* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */
-#ifndef CONFIG_TSEC_TBICR_SETTINGS
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
+#ifndef CFG_TSEC_TBICR_SETTINGS
+#define CFG_TSEC_TBICR_SETTINGS ( \
 		TBICR_PHY_RESET \
 		| TBICR_ANEG_ENABLE \
 		| TBICR_FULL_DUPLEX \
 		| TBICR_SPEED1_SET \
 		)
-#endif /* CONFIG_TSEC_TBICR_SETTINGS */
+#endif /* CFG_TSEC_TBICR_SETTINGS */
 
 /* Configure the TBI for SGMII operation */
 static void tsec_configure_serdes(struct tsec_private *priv)
@@ -78,7 +78,7 @@ static void tsec_configure_serdes(struct tsec_private *priv)
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
 			      0, TBI_TBICON, TBICON_CLK_SELECT);
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
-			      0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS);
+			      0, TBI_CR, CFG_TSEC_TBICR_SETTINGS);
 }
 
 /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index dd8dd42b54d5..91e5c544f616 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);
 #define TSEC3_PHYIDX		0
 
 /* TBI PHY configuration for SGMII mode */
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
+#define CFG_TSEC_TBICR_SETTINGS ( \
 		TBICR_PHY_RESET \
 		| TBICR_ANEG_ENABLE \
 		| TBICR_FULL_DUPLEX \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1d60965b520c..bd8a5af65985 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -231,7 +231,7 @@ CFG_TSEC4
 CFG_TSEC4_NAME
 CFG_TSECV2
 CFG_TSECV2_1
-CONFIG_TSEC_TBICR_SETTINGS
+CFG_TSEC_TBICR_SETTINGS
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBOOTPATH
-- 
2.25.1



More information about the U-Boot mailing list