[U-Boot] [PATCH 05/10] net: fec: Use PHY_ADDR instead of FEC_MXC_PHYADDR
Jagan Teki
jagan at amarulasolutions.com
Mon Jul 30 12:45:04 UTC 2018
- use PHY_ADDR_ENABLE and PHY_ADDR
- few boards are using FEC_MXC_PHYADDR without PHYLIB
enable the same.
Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +-
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 3 +--
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
board/freescale/mx7dsabresd/mx7dsabresd.c | 3 +--
board/samtec/vining_2000/vining_2000.c | 3 +--
board/sks-kinkel/sksimx6/sksimx6.c | 2 +-
board/technexion/pico-imx7d/pico-imx7d.c | 3 +--
board/toradex/colibri_imx7/colibri_imx7.c | 3 +--
board/tqc/tqma6/tqma6_mba6.c | 2 +-
board/udoo/neo/neo.c | 2 +-
configs/apalis_imx6_defconfig | 1 +
configs/apalis_imx6_nospl_com_defconfig | 1 +
configs/apalis_imx6_nospl_it_defconfig | 2 ++
configs/apf27_defconfig | 2 ++
configs/cgtqmx6eval_defconfig | 1 +
configs/cl-som-imx7_defconfig | 1 +
configs/colibri_imx6_defconfig | 1 +
configs/colibri_imx6_nospl_defconfig | 1 +
configs/dms-ba16-1g_defconfig | 1 +
configs/dms-ba16_defconfig | 1 +
configs/flea3_defconfig | 1 +
configs/ge_bx50v3_defconfig | 2 ++
configs/imx6dl_mamoj_defconfig | 1 +
configs/imx6qdl_icore_rqs_defconfig | 1 +
configs/marsboard_defconfig | 1 +
configs/mccmon6_nor_defconfig | 1 +
configs/mccmon6_sd_defconfig | 1 +
configs/mx25pdk_defconfig | 2 ++
configs/mx35pdk_defconfig | 2 ++
configs/mx51evk_defconfig | 2 ++
configs/mx53cx9020_defconfig | 2 ++
configs/mx53evk_defconfig | 2 ++
configs/mx53loco_defconfig | 2 ++
configs/mx53ppd_defconfig | 2 ++
configs/mx53smd_defconfig | 2 ++
configs/mx6sabreauto_defconfig | 1 +
configs/mx6sabresd_defconfig | 1 +
configs/mx6sxsabresd_defconfig | 1 +
configs/mx6sxsabresd_spl_defconfig | 1 +
configs/mx6ul_14x14_evk_defconfig | 1 +
configs/mx6ul_9x9_evk_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/novena_defconfig | 1 +
configs/opos6uldev_defconfig | 1 +
configs/ot1200_defconfig | 1 +
configs/ot1200_spl_defconfig | 1 +
configs/pcm058_defconfig | 1 +
configs/pfla02_defconfig | 1 +
configs/pico-imx6ul_defconfig | 1 +
configs/pico-imx7d_defconfig | 1 +
configs/platinum_titanium_defconfig | 1 +
configs/riotboard_defconfig | 1 +
configs/secomx6quq7_defconfig | 1 +
configs/sksimx6_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/titanium_defconfig | 1 +
configs/tqma6dl_mba6_mmc_defconfig | 1 +
configs/tqma6dl_mba6_spi_defconfig | 1 +
configs/tqma6q_mba6_mmc_defconfig | 1 +
configs/tqma6q_mba6_spi_defconfig | 1 +
configs/tqma6s_mba6_mmc_defconfig | 1 +
configs/tqma6s_mba6_spi_defconfig | 1 +
configs/tqma6s_wru4_mmc_defconfig | 1 +
configs/udoo_defconfig | 1 +
configs/wandboard_defconfig | 1 +
configs/woodburn_defconfig | 1 +
configs/woodburn_sd_defconfig | 1 +
configs/zc5202_defconfig | 1 +
configs/zc5601_defconfig | 1 +
configs/zmx25_defconfig | 1 +
doc/README.fec_mxc | 2 +-
drivers/net/fec_mxc.c | 15 +++++++++------
drivers/net/phy/Kconfig | 1 +
include/configs/advantech_dms-ba16.h | 1 -
include/configs/apalis_imx6.h | 1 -
include/configs/apf27.h | 5 -----
include/configs/aristainetos-common.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cl-som-imx7.h | 2 --
include/configs/cm_fx6.h | 1 -
include/configs/colibri_imx6.h | 1 -
include/configs/colibri_imx7.h | 1 -
include/configs/colibri_vf.h | 1 -
include/configs/dh_imx6.h | 1 -
include/configs/display5.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/flea3.h | 1 -
include/configs/ge_bx50v3.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/imx6-engicam.h | 9 ---------
include/configs/imx6_logic.h | 1 -
include/configs/imx6dl-mamoj.h | 3 ---
include/configs/kp_imx6q_tpc.h | 1 -
include/configs/liteboard.h | 1 -
include/configs/mccmon6.h | 1 -
include/configs/mx25pdk.h | 1 -
include/configs/mx35pdk.h | 1 -
include/configs/mx51evk.h | 1 -
include/configs/mx53cx9020.h | 1 -
include/configs/mx53evk.h | 1 -
include/configs/mx53loco.h | 1 -
include/configs/mx53ppd.h | 1 -
include/configs/mx53smd.h | 1 -
include/configs/mx6cuboxi.h | 1 -
include/configs/mx6sabre_common.h | 1 -
include/configs/mx6slevk.h | 1 -
include/configs/mx6sxsabreauto.h | 1 -
include/configs/mx6sxsabresd.h | 1 -
include/configs/mx6ul_14x14_evk.h | 2 --
include/configs/mx7dsabresd.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/opos6uldev.h | 1 -
include/configs/ot1200.h | 1 -
include/configs/pcm052.h | 1 -
include/configs/pcm058.h | 1 -
include/configs/pfla02.h | 1 -
include/configs/pico-imx6ul.h | 1 -
include/configs/pico-imx7d.h | 1 -
include/configs/platinum_picon.h | 1 -
include/configs/platinum_titanium.h | 1 -
include/configs/secomx6quq7.h | 1 -
include/configs/sksimx6.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/titanium.h | 1 -
include/configs/tqma6_mba6.h | 2 --
include/configs/tqma6_wru4.h | 1 -
include/configs/ts4800.h | 1 -
include/configs/udoo.h | 1 -
include/configs/udoo_neo.h | 1 -
include/configs/vf610twr.h | 1 -
include/configs/vining_2000.h | 2 --
include/configs/wandboard.h | 1 -
include/configs/woodburn_common.h | 1 -
include/configs/xpress.h | 1 -
include/configs/zc5202.h | 1 -
include/configs/zc5601.h | 1 -
include/configs/zmx25.h | 5 -----
scripts/config_whitelist.txt | 1 -
144 files changed, 97 insertions(+), 110 deletions(-)
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 1bc33b0a7b..e7ee6fdde9 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -210,7 +210,7 @@ int board_eth_init(bd_t *bis)
gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1);
/* MAC initialization */
return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ CONFIG_PHY_ADDR, IMX_FEC_BASE);
}
/*
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 975af2c895..214b06fbf5 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -99,8 +99,7 @@ int board_eth_init(bd_t *bis)
imx_iomux_v3_setup_multiple_pads(fec2_pads, ARRAY_SIZE(fec2_pads));
setup_fec();
- ret = fecmxc_initialize_multi(bis, 1,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ ret = fecmxc_initialize_multi(bis, 1, CONFIG_PHY_ADDR, IMX_FEC_BASE);
if (ret)
printf("FEC%d MXC: %s:failed\n", 1, __func__);
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 1c9ffdaa16..bc03e15574 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -517,7 +517,7 @@ int board_eth_init(bd_t *bis)
setup_iomux_fec(CONFIG_FEC_ENET_DEV);
return fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ CONFIG_PHY_ADDR, IMX_FEC_BASE);
}
static int setup_fec(int fec_id)
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 90e2d1a92a..81a2edc21f 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -241,8 +241,7 @@ int board_eth_init(bd_t *bis)
setup_iomux_fec();
- ret = fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ ret = fecmxc_initialize_multi(bis, 0, CONFIG_PHY_ADDR, IMX_FEC_BASE);
if (ret)
printf("FEC1 MXC: %s:failed\n", __func__);
diff --git a/board/samtec/vining_2000/vining_2000.c b/board/samtec/vining_2000/vining_2000.c
index f37365c5cb..a860c4bc51 100644
--- a/board/samtec/vining_2000/vining_2000.c
+++ b/board/samtec/vining_2000/vining_2000.c
@@ -157,8 +157,7 @@ int board_eth_init(bd_t *bis)
gpio_set_value(PHY_RESET, 1);
mdelay(1);
- ret = fecmxc_initialize_multi(bis, 0, CONFIG_FEC_MXC_PHYADDR,
- IMX_FEC_BASE);
+ ret = fecmxc_initialize_multi(bis, 0, CONFIG_PHY_ADDR, IMX_FEC_BASE);
if (ret)
goto eth_fail;
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index f6e3d4d12e..f871b0ddb5 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -147,7 +147,7 @@ int board_eth_init(bd_t *bis)
if (!bus)
return -EINVAL;
/* scan phy */
- phydev = phy_find_by_mask(bus, (0xf << CONFIG_FEC_MXC_PHYADDR),
+ phydev = phy_find_by_mask(bus, (0xf << CONFIG_PHY_ADDR),
PHY_INTERFACE_MODE_RGMII);
if (!phydev) {
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 44c81ecdb3..f1864775f9 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -167,8 +167,7 @@ int board_eth_init(bd_t *bis)
{
setup_iomux_fec();
- return fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ return fecmxc_initialize_multi(bis, 0, CONFIG_PHY_ADDR, IMX_FEC_BASE);
}
static int setup_fec(void)
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index cd98ec8216..102aaa82f7 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -251,8 +251,7 @@ int board_eth_init(bd_t *bis)
setup_iomux_fec();
- ret = fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+ ret = fecmxc_initialize_multi(bis, 0, CONFIG_PHY_ADDR, IMX_FEC_BASE);
if (ret)
printf("FEC1 MXC: %s:failed\n", __func__);
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index f7072b8563..953727b08d 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -294,7 +294,7 @@ int board_eth_init(bd_t *bis)
if (!bus)
return -EINVAL;
/* scan phy */
- phydev = phy_find_by_mask(bus, (0xf << CONFIG_FEC_MXC_PHYADDR),
+ phydev = phy_find_by_mask(bus, (0xf << CONFIG_PHY_ADDR),
PHY_INTERFACE_MODE_RGMII);
if (!phydev) {
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 828161360c..0fb5a4c070 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -303,7 +303,7 @@ int board_eth_init(bd_t *bis)
if (!bus)
return -EINVAL;
- phydev = phy_find_by_mask(bus, (0x1 << CONFIG_FEC_MXC_PHYADDR),
+ phydev = phy_find_by_mask(bus, (0x1 << CONFIG_PHY_ADDR),
PHY_INTERFACE_MODE_RMII);
if (!phydev) {
free(bus);
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index da7053104c..311df3f4ee 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -53,6 +53,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig
index df2338921d..b473101428 100644
--- a/configs/apalis_imx6_nospl_com_defconfig
+++ b/configs/apalis_imx6_nospl_com_defconfig
@@ -42,6 +42,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig
index 8446dce4ad..3f62557feb 100644
--- a/configs/apalis_imx6_nospl_it_defconfig
+++ b/configs/apalis_imx6_nospl_it_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_PHY_ADDR=6
CONFIG_SYS_THUMB_BUILD=y
CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000
@@ -42,6 +43,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 6689214172..7276442c7f 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -41,6 +41,8 @@ CONFIG_MMC_MXC=y
CONFIG_NAND=y
CONFIG_NAND_MXC=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 99b6efb2df..c0d3c35f3a 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -53,6 +53,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 8c67f95bfd..79e810be13 100644
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -47,6 +47,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_PHYLIB=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 1e642638ce..35e656cbd6 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -52,6 +52,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
index 819364f1f3..f5867096a1 100644
--- a/configs/colibri_imx6_nospl_defconfig
+++ b/configs/colibri_imx6_nospl_defconfig
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index 9172e2140c..05a874f245 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index 28c3bc6edb..49e029f7b6 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index a47ddda9c4..9a2951e1dd 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -26,6 +26,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_NAND_MXC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index 7576b74e62..acc4f96367 100644
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -36,6 +36,8 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_E1000=y
CONFIG_CMD_E1000=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
index 3293a6d5d6..4f9d89b532 100644
--- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2
CONFIG_SYS_I2C_MXC=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig
index d174c21834..0099717ee1 100644
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_I2C_MXC=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 1c117c38fa..2645a969cf 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index 48cf122d80..3243075dd6 100644
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -32,6 +32,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 13bba555d3..5f7c3523d1 100644
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -33,6 +33,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig
index a93ecf291a..376cb2ec84 100644
--- a/configs/mx25pdk_defconfig
+++ b/configs/mx25pdk_defconfig
@@ -19,6 +19,8 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_DOS_PARTITION=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_FS_EXT4=y
diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index 75fabb7767..3138a28111 100644
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -29,6 +29,8 @@ CONFIG_FSL_ESDHC=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_NAND_MXC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SMC911X=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 443b8e4d12..0214d5a3ba 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -21,6 +21,8 @@ CONFIG_CMD_DATE=y
CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index c86a491b18..f2b2571279 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -24,6 +24,8 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_FPGA_ALTERA=y
CONFIG_FPGA_CYCLON2=y
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PINCTRL=y
diff --git a/configs/mx53evk_defconfig b/configs/mx53evk_defconfig
index f1cae5d273..7ca10519ce 100644
--- a/configs/mx53evk_defconfig
+++ b/configs/mx53evk_defconfig
@@ -13,6 +13,8 @@ CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FSL_ESDHC=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 8e1b852d01..ad68f26bf7 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -23,6 +23,8 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_USB=y
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index b254ae6cd7..dc254a7d62 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -28,6 +28,8 @@ CONFIG_BOOTCOUNT_EXT=y
CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_RTC_S35392A=y
diff --git a/configs/mx53smd_defconfig b/configs/mx53smd_defconfig
index 39c011c7b2..48151c3bdb 100644
--- a/configs/mx53smd_defconfig
+++ b/configs/mx53smd_defconfig
@@ -14,6 +14,8 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=31
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 08a3edca24..8d3ae8dcc2 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -48,6 +48,7 @@ CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index ef9d266cfd..b41bb469fe 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -56,6 +56,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PCI=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index fbb2d09f0b..59135f12e0 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PCI=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index 84fce44542..49db63cfc7 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -47,6 +47,7 @@ CONFIG_DM_MMC=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PCI=y
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index 68b2c41105..eedc26ca4a 100644
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
index 84d4c63871..0c76bc3d71 100644
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 42bfd007bd..51157e7b55 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 27fe342b57..cb8627bf11 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 87276fe9c5..21db858859 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 9cdcdd61d7..be711d54dc 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -39,6 +39,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 47775e7a7a..63f3d4ee7d 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 20d5c0240e..b835c6a306 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -37,6 +37,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 5a67e133a9..59ad72ca80 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=7
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index 523ab39a3d..8fb6171683 100644
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYS_I2C_MXC=y
CONFIG_PWRSEQ=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index 86d4fafab5..97b2721f46 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=5
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 136ade3d7d..fa8b53d4bc 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -44,6 +44,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
index 8b3232f685..bed4b877b1 100644
--- a/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@ -46,6 +46,7 @@ CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index f78c8acced..0dcf15f08e 100644
--- a/configs/pfla02_defconfig
+++ b/configs/pfla02_defconfig
@@ -45,6 +45,7 @@ CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
index 1f6b9503e7..13414f4215 100644
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_DFU_MMC=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index c5a74ebb93..1471e6779c 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_USB=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 695b883d81..edc2d4dfbb 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -46,6 +46,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index aab23af94b..94c29b2233 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -23,6 +23,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index 81b2a6a5a1..d810a3a1b4 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/sksimx6_defconfig b/configs/sksimx6_defconfig
index 605221d477..be5f318f54 100644
--- a/configs/sksimx6_defconfig
+++ b/configs/sksimx6_defconfig
@@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_PHY_MICREL_KSZ8XXX=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 269cc39516..575c4d10a2 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -40,6 +40,7 @@ CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PCI=y
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index d7dd805459..06c6f23f09 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=4
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6dl_mba6_mmc_defconfig b/configs/tqma6dl_mba6_mmc_defconfig
index a94b98bafa..a83dbaff8e 100644
--- a/configs/tqma6dl_mba6_mmc_defconfig
+++ b/configs/tqma6dl_mba6_mmc_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6dl_mba6_spi_defconfig b/configs/tqma6dl_mba6_spi_defconfig
index a393f71b63..969349c0b7 100644
--- a/configs/tqma6dl_mba6_spi_defconfig
+++ b/configs/tqma6dl_mba6_spi_defconfig
@@ -35,6 +35,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 6cb680f55d..0358033a98 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -33,6 +33,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index 297f320ed9..eeba0b145c 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 6c501cb8dc..8b4fad98c7 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index 36cae10e5f..4ff90c423a 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -35,6 +35,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=3
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index 2d78ddd59b..5e2515db37 100644
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -58,6 +58,7 @@ CONFIG_LED_STATUS_CMD=y
CONFIG_PCA9551_LED=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_USB=y
diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
index fe60b1b23f..c93113c473 100644
--- a/configs/udoo_defconfig
+++ b/configs/udoo_defconfig
@@ -36,6 +36,7 @@ CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=6
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_FEC_MXC=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 701de3653e..2111b43d84 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -36,6 +36,7 @@ CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_DM_THERMAL=y
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index f0382aa0a2..cb07b39990 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -31,6 +31,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_NAND_MXC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index 24fcd12225..20421a561d 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -42,6 +42,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_NAND_MXC=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=1
CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig
index 1dc4312cb4..5339f8c32a 100644
--- a/configs/zc5202_defconfig
+++ b/configs/zc5202_defconfig
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_PHYLIB=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_PCI=y
diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
index d43281248b..e3773231e8 100644
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR=16
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_SPI=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 690a912f97..a43decaf0b 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_FLASH=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
+CONFIG_PHYLIB=y
CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_USB=y
diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index 9ca6ac2fb5..26a710d0cd 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -23,7 +23,7 @@ CONFIG_PHYLIB
CONFIG_FEC_MXC_NO_ANEG
Relevant only if PHYLIB not used. Skips auto-negotiation restart.
-CONFIG_FEC_MXC_PHYADDR
+CONFIG_PHY_ADDR
Optional, selects the exact phy address that should be connected
and function fecmxc_initialize will try to initialize it.
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 49bb926efa..11182f27d8 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -51,7 +51,11 @@ DECLARE_GLOBAL_DATA_PTR;
#endif
#if defined(CONFIG_TARGET_APX4DEVKIT) || defined(CONFIG_TARGET_MX6QARM2)
-# define CONFIG_FEC_MXC_PHY_ADDR 0
+# define CONFIG_PHY_ADDR 0
+#endif
+
+#ifdef CONFIG_TARGET_SC_SPS_1
+# undef CONFIG_PHY_ADDR
#endif
/*
@@ -1184,11 +1188,10 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr)
return ret;
}
-#ifdef CONFIG_FEC_MXC_PHYADDR
+#ifdef CONFIG_PHY_ADDR
int fecmxc_initialize(bd_t *bd)
{
- return fecmxc_initialize_multi(bd, -1, CONFIG_FEC_MXC_PHYADDR,
- IMX_FEC_BASE);
+ return fecmxc_initialize_multi(bd, -1, CONFIG_PHY_ADDR, IMX_FEC_BASE);
}
#endif
@@ -1234,8 +1237,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
struct phy_device *phydev;
int mask = 0xffffffff;
-#ifdef CONFIG_FEC_MXC_PHYADDR
- mask = 1 << CONFIG_FEC_MXC_PHYADDR;
+#ifdef CONFIG_PHY_ADDR
+ mask = 1 << CONFIG_PHY_ADDR;
#endif
phydev = phy_find_by_mask(priv->bus, mask, priv->xcv_type);
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f5821dfed9..35477761ec 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -16,6 +16,7 @@ if PHYLIB
config PHY_ADDR_ENABLE
bool "Limit phy address"
default y if ARCH_SUNXI
+ default y if FEC_MXC
help
Select this if you want to control which phy address is used
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index ab0b3b90d9..1972a3a804 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -58,7 +58,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_ATHEROS
/* Serial Flash */
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index bb15b23afe..ff6e144ff2 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -71,7 +71,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 4096
#define CONFIG_TFTP_TSIZE
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 5919e30e2e..5b33ef844d 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -187,11 +187,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-/*
- * Ethernet (on SOC imx FEC)
- */
-#define CONFIG_FEC_MXC_PHYADDR 0x1f
-
/*
* FPGA
*/
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 933b91b7e7..70b80563b7 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -27,7 +27,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_SPI_FLASH_MTD
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index d3e08e16ec..3055337a81 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -85,7 +85,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHY_ATHEROS
/* Command definition */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index ed84124dc3..242c5dc712 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -26,9 +26,7 @@
/* Network */
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
-#define CONFIG_PHYLIB
#define CONFIG_PHY_ATHEROS
/* ENET1 */
#define IMX_FEC_BASE ENET_IPS_BASE_ADDR
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 89bd25e4f0..1f591e4aa8 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -177,7 +177,6 @@
#endif
/* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_PHY_ATHEROS
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 5ad0c07694..a723f3b9b8 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -59,7 +59,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index c35ea3598e..b6ba99a39a 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -22,7 +22,6 @@
/* Network */
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 16352
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 49ea4f27d4..7d89a4c6d2 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -51,7 +51,6 @@
#define IMX_FEC_BASE ENET1_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_IPADDR 192.168.10.2
#define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index d532e09494..ee38adb61e 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -45,7 +45,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_ARP_TIMEOUT 200UL
/* Fuses */
diff --git a/include/configs/display5.h b/include/configs/display5.h
index c08a18039e..93b405079c 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -85,7 +85,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#endif
/* MMC Configs */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 43ed5b862a..f40986cc6e 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -44,7 +44,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_ATHEROS
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 3f4a514d10..afd66c0544 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -68,7 +68,6 @@
* Ethernet on SOC (FEC)
*/
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_ARP_TIMEOUT 200UL
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 4dfa3575a5..08f9d3a9f0 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -67,7 +67,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_ATHEROS
#endif
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6df5d154f4..8b8878ad46 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -125,7 +125,6 @@
/* Ethernet support */
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_ARP_TIMEOUT 200UL
/* USB Configs */
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 85f2991ab0..667cb7dbd5 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -157,15 +157,6 @@
# define CONFIG_MTD_PARTITIONS
#endif
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-# ifdef CONFIG_TARGET_MX6Q_ICORE_RQS
-# define CONFIG_FEC_MXC_PHYADDR 3
-# else
-# define CONFIG_FEC_MXC_PHYADDR 0
-# endif
-#endif
-
/* Falcon Mode */
#ifdef CONFIG_SPL_OS_BOOT
# define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index e22d76c4ef..f345e74697 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -23,7 +23,6 @@
/* Ethernet Configs */
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 7f7d2e09bd..529e1f2cb9 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -53,9 +53,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 2
#define CONFIG_SUPPORT_EMMC_BOOT
-/* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR 1
-
/* USB */
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 915ae8b7ce..a32593b746 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -28,7 +28,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_ARP_TIMEOUT 200UL
/* Fuses */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index f136496e27..7980a0f392 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -143,7 +143,6 @@
#define CONFIG_FEC_ENET_DEV 0
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index ab787b2f15..6382c0dbae 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -89,7 +89,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200 quiet\0" \
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 81079e040f..27e1ebe37d 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -60,7 +60,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR 0x1f
#define CONFIG_ENV_OVERWRITE
/* ESDHC driver */
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index d4243b48e8..ca81262a75 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -84,7 +84,6 @@
* Ethernet on SOC (FEC)
*/
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
#define CONFIG_ARP_TIMEOUT 200UL
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ea3d80d25c..ff8db72954 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -56,7 +56,6 @@
* Eth Configs
*/
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* USB Configs */
#define CONFIG_USB_EHCI_MX5
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 4a59a0485f..0b73786991 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -38,7 +38,6 @@
/* Eth Configs */
#define IMX_FEC_BASE FEC_BASE_ADDR
#define CONFIG_ETHPRIME "FEC0"
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* USB Configs */
#define CONFIG_USB_EHCI_MX5
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index c62b31fcf9..7d8cd4894a 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -47,7 +47,6 @@
/* Eth Configs */
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 6b5e12d5c7..354f7e7d77 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -34,7 +34,6 @@
/* Eth Configs */
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* USB Configs */
#define CONFIG_USB_EHCI_MX5
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index d28cfa8744..5d7f86a7f5 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -40,7 +40,6 @@
/* Eth Configs */
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* USB Configs */
#define CONFIG_USB_EHCI_MX5
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 0813ca1733..31164a34d4 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -40,7 +40,6 @@
#define CONFIG_HAS_ETH1
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1F
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 7de4df4b2b..8e61b15997 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -30,7 +30,6 @@
/* Ethernet Configuration */
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 86f192fb2d..7efba6961d 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -23,7 +23,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_PHY_ATHEROS
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f8a865d06e..a24b11acc4 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -34,7 +34,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_PHY_SMSC
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index e5473570a9..c59bb3f803 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -127,7 +127,6 @@
/* Network */
#define IMX_FEC_BASE ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 095c0a8b56..cae41caa26 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -151,7 +151,6 @@
/* Network */
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 90f28a95f5..a87ce291b5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -188,11 +188,9 @@
#if (CONFIG_FEC_ENET_DEV == 0)
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x2
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#elif (CONFIG_FEC_ENET_DEV == 1)
#define IMX_FEC_BASE ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#endif
#define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 384836746b..afda45861c 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -21,7 +21,6 @@
/* Network */
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_PHY_BROADCOM
/* ENET1 */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c6795d7f03..87c1f8b990 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -56,7 +56,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 6
/* USB Configs */
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
diff --git a/include/configs/novena.h b/include/configs/novena.h
index fe4e92598f..75e3fa0716 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -64,7 +64,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x7
#define CONFIG_ARP_TIMEOUT 200UL
#endif
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 87a00459f9..59bc102e42 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -48,7 +48,6 @@
/* Ethernet */
#ifdef CONFIG_FEC_MXC
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
#endif
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index db03f38fdd..3242bddaf8 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -71,7 +71,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x5
#define CONFIG_PHY_SMSC
#ifndef CONFIG_SPL
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 922ed12867..4daf3ebaaa 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -43,7 +43,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_FEC_MXC_PHYADDR 0
/* QSPI Configs*/
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 4e55da4b3b..58b2a6ad21 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -34,7 +34,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 3
/* SPI Flash */
#define CONFIG_SF_DEFAULT_BUS 0
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index fe3702c4d3..4f969a6cd9 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -32,7 +32,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 3
/* SPI Flash */
#define CONFIG_SF_DEFAULT_BUS 2
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 34660a77dc..7ea006cccc 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -16,7 +16,6 @@
/* Network support */
#define IMX_FEC_BASE ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
/* Size of malloc() pool */
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index c568b9ca5f..5569776909 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -20,7 +20,6 @@
/* Network */
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_PHY_ATHEROS
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index c8b88995c7..4e24790799 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -13,7 +13,6 @@
#include <configs/platinum.h>
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_HOSTNAME "picon"
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index afbfc94ca4..d57aabed3b 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -16,7 +16,6 @@
#include <configs/platinum.h>
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_RESET_DELAY 1000
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 1804391fbe..95ba2ed163 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -29,7 +29,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index 58dfab08e6..c222090850 100644
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -24,7 +24,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x01
#define CONFIG_PHY_MICREL_KSZ9021
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 59802766d8..df8cbd962a 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -52,7 +52,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 1aa431e65a..2f6e2c71ad 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -41,7 +41,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_FEC_MXC_PHYADDR 4
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index d459c98c06..896139ed51 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -12,8 +12,6 @@
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x03
-
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 1d793f2fe4..06607c22e9 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -9,7 +9,6 @@
/* Ethernet */
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x01
#define CONFIG_PHY_SMSC
/* UART */
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 11275ab2ea..995eec9dcc 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -59,7 +59,6 @@
#define IMX_FEC_BASE FEC_BASE_ADDR
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 145f0f03c7..fe368bf611 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -35,7 +35,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index e294b2c283..3586b144b5 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -97,7 +97,6 @@
/* Network */
#define CONFIG_FEC_ENET_DEV 0
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC0"
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6d307611d4..72ddbdc496 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -46,7 +46,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_FEC_MXC_PHYADDR 0
/* QSPI Configs*/
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 5c9367ce9e..3b12f1ff1b 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -63,8 +63,6 @@
/* Network */
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x0
-
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index d685cacc57..b20d3747bc 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -59,7 +59,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index b36c890afb..797d111b79 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -77,7 +77,6 @@
* Ethernet on SOC (FEC)
*/
#define IMX_FEC_BASE FEC_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_DISCOVER_PHY
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 781955eeae..9fb59fb793 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -67,7 +67,6 @@
#define CONFIG_FEC_ENET_DEV 0
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_PHY_SMSC
diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
index 72ebe069ea..55fb7c1556 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -20,7 +20,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_MII100
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_MV88E6352_SWITCH
#define CONFIG_PCI_SCAN_SHOW
diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
index 4f376ba523..b6f00d6565 100644
--- a/include/configs/zc5601.h
+++ b/include/configs/zc5601.h
@@ -21,7 +21,6 @@
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0x10
#define CONFIG_FEC_FIXED_SPEED 1000 /* No autoneg, fix Gb */
#endif /*__EL6Q_CONFIG_H */
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 1e5f099ea2..58393ce68e 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -40,11 +40,6 @@
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART2_BASE
-/*
- * Ethernet
- */
-#define CONFIG_FEC_MXC_PHYADDR 0x00
-
/*
* BOOTP options
*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c63be7d4ce..62cd304385 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -603,7 +603,6 @@ CONFIG_FEATURE_SH_STANDALONE_SHELL
CONFIG_FEC_ENET_DEV
CONFIG_FEC_FIXED_SPEED
CONFIG_FEC_MXC_25M_REF_CLK
-CONFIG_FEC_MXC_PHYADDR
CONFIG_FEC_MXC_SWAP_PACKET
CONFIG_FEC_XCV_TYPE
CONFIG_FEROCEON
--
2.18.0.321.gffc6fa0e3
More information about the U-Boot
mailing list