[PoC 026/241] global: Migrate CONFIG_FEC_FIXED_SPEED to CFG

Tom Rini
2022-11-20T13:38:56Z

doc/README.fec_mxc | 2 +-
drivers/net/fec_mxc.c | 8 ++++----
include/configs/brppt2.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index d17dfb676f79..d27276b8783e 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -22,7 +22,7 @@ CONFIG_FEC_MXC_PHYADDR
Optional, selects the exact phy address that should be connected
and function fecmxc_initialize will try to initialize it.

-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
Optional, selects a fixed speed on the MAC interface without asking some
phy. This is usefull if there is a direct MAC <-> MAC connection, for
example if the CPU is connected directly via the RGMII interface to a
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a61a1fc75738..659625a29d39 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -268,7 +268,7 @@ static int miiphy_restart_aneg(struct eth_device *dev)
return ret;
}

-#ifndef CONFIG_FEC_FIXED_SPEED
+#ifndef CFG_FEC_FIXED_SPEED
static int miiphy_wait_aneg(struct eth_device *dev)
{
uint32_t start;
@@ -294,7 +294,7 @@ static int miiphy_wait_aneg(struct eth_device *dev)

return 0;
}
-#endif /* CONFIG_FEC_FIXED_SPEED */
+#endif /* CFG_FEC_FIXED_SPEED */
#endif

static int fec_rx_task_enable(struct fec_priv *fec)
@@ -536,8 +536,8 @@ static int fec_open(struct udevice *dev)
}
speed = fec->phydev->speed;
}
-#elif CONFIG_FEC_FIXED_SPEED
- speed = CONFIG_FEC_FIXED_SPEED;
+#elif CFG_FEC_FIXED_SPEED
+ speed = CFG_FEC_FIXED_SPEED;
#else
miiphy_wait_aneg(edev);
speed = miiphy_speed(edev->name, fec->phy_id);
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 7e4e8ee262bf..92f34407b401 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -81,7 +81,7 @@ BUR_COMMON_ENV \
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

/* Ethernet */
-#define CONFIG_FEC_FIXED_SPEED _1000BASET
+#define CFG_FEC_FIXED_SPEED _1000BASET

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0a60216b8050..1917a8d090b2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -26,7 +26,7 @@ CFG_FB_ADDR
CFG_FDTADDR
CFG_FDTFILE
CFG_FEC_ENET_DEV
-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
CONFIG_FEC_MXC_PHYADDR
CONFIG_FLASH_BR_PRELIM
CONFIG_FLASH_OR_PRELIM
--
2.25.1