diff mbox series

[PoC,215/241] global: Migrate CONFIG_TSEC4 to CFG

Message ID 20221120141743.3059310-16-trini@konsulko.com
State RFC
Delegated to: Tom Rini
Headers show
Series None | expand

Commit Message

Tom Rini Nov. 20, 2022, 2:17 p.m. UTC 
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/pixis.c          | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c | 2 +-
 drivers/net/tsec.c                      | 2 +-
 include/configs/MPC8548CDS.h            | 4 ++--
 scripts/config_whitelist.txt            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index ce60ec2c10f6..ad4d52a36e25 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -314,7 +314,7 @@  static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
 		switch_mask = PIXIS_VCFGEN1_TSEC3SER;
 		break;
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	case 4:
 		mask = PIXIS_VSPEED2_TSEC4SER;
 		switch_mask = PIXIS_VCFGEN1_TSEC4SER;
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index cbe8e0ddca99..e7e271ee2d53 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -224,7 +224,7 @@  int board_eth_init(struct bd_info *bis)
 		num++;
 	}
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	/* initialize TSEC4 only if Carrier is 1.3 or above on CDS */
 	if (get_board_version() >= 0x13) {
 		SET_STD_TSEC_INFO(tsec_info[num], 4);
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 985cde092bca..734e10c563e0 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -44,7 +44,7 @@  static struct tsec_info_struct tsec_info[] = {
 #ifdef CFG_TSEC3
 	STD_TSEC_INFO(3),	/* TSEC3 */
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	STD_TSEC_INFO(4),	/* TSEC4 */
 #endif
 };
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 7bc8f238e05b..a493d73a4a82 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -291,8 +291,8 @@ 
 #define CFG_TSEC2_NAME	"eTSEC1"
 #define CFG_TSEC3	1
 #define CFG_TSEC3_NAME	"eTSEC2"
-#define CONFIG_TSEC4
-#define CONFIG_TSEC4_NAME	"eTSEC3"
+#define CFG_TSEC4
+#define CFG_TSEC4_NAME	"eTSEC3"
 #undef CONFIG_MPC85XX_FEC
 
 #define TSEC1_PHY_ADDR		0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a44112ccd25e..fa67d6fe3468 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -227,8 +227,8 @@  CFG_TSEC2
 CFG_TSEC2_NAME
 CFG_TSEC3
 CFG_TSEC3_NAME
-CONFIG_TSEC4
-CONFIG_TSEC4_NAME
+CFG_TSEC4
+CFG_TSEC4_NAME
 CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS