From 08f1d58affa4a3ec1fb68717be088dd3556fe26a Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Fri, 11 Mar 2022 09:12:10 -0500
Subject: [PATCH] net: fec_mxc: Drop CONFIG_FEC_XCV_TYPE

With all boards now using DM_ETH we determine the value for
CONFIG_FEC_XCV_TYPE at run time, except in the case of the default
fall-back.  Set the fallback directly now.

Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ramon Fried <rfried.dev@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 doc/README.fec_mxc                       |  5 -----
 drivers/net/fec_mxc.c                    | 10 +++-------
 include/configs/apalis-imx8x.h           |  1 -
 include/configs/aristainetos2.h          |  2 --
 include/configs/brppt2.h                 |  1 -
 include/configs/capricorn-common.h       |  3 ---
 include/configs/cgtqmx8.h                |  1 -
 include/configs/cl-som-imx7.h            |  1 -
 include/configs/cm_fx6.h                 |  1 -
 include/configs/dh_imx6.h                |  1 -
 include/configs/imx6_logic.h             |  1 -
 include/configs/imx8mm-cl-iot-gate.h     |  1 -
 include/configs/imx8mm_beacon.h          |  1 -
 include/configs/imx8mm_evk.h             |  1 -
 include/configs/imx8mm_venice.h          |  1 -
 include/configs/imx8mn_beacon.h          |  1 -
 include/configs/imx8mn_var_som.h         |  5 -----
 include/configs/imx8mn_venice.h          |  1 -
 include/configs/imx8mp_evk.h             |  1 -
 include/configs/imx8mp_rsb3720.h         |  1 -
 include/configs/imx8mq_evk.h             |  1 -
 include/configs/imx8mq_phanbell.h        |  1 -
 include/configs/imx8qm_mek.h             |  3 ---
 include/configs/imx8qm_rom7720.h         |  3 ---
 include/configs/imx8qxp_mek.h            |  3 ---
 include/configs/imx8ulp_evk.h            |  1 -
 include/configs/kontron_pitx_imx8m.h     |  1 -
 include/configs/liteboard.h              |  1 -
 include/configs/m53menlo.h               |  1 -
 include/configs/mx6sxsabreauto.h         |  2 --
 include/configs/mx6sxsabresd.h           |  2 --
 include/configs/mx6ul_14x14_evk.h        |  2 --
 include/configs/mxs.h                    |  7 -------
 include/configs/nitrogen6x.h             |  1 -
 include/configs/npi_imx6ull.h            |  1 -
 include/configs/o4-imx6ull-nano.h        |  4 ----
 include/configs/pico-imx6.h              |  1 -
 include/configs/pico-imx6ul.h            |  1 -
 include/configs/pico-imx8mq.h            |  1 -
 include/configs/somlabs_visionsom_6ull.h |  1 -
 include/configs/tqma6_mba6.h             |  2 --
 include/configs/tqma6_wru4.h             |  1 -
 include/configs/verdin-imx8mm.h          |  1 -
 include/configs/verdin-imx8mp.h          |  1 -
 include/configs/vf610twr.h               |  1 -
 include/configs/vining_2000.h            |  2 --
 include/configs/xpress.h                 |  1 -
 47 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index 9ca6ac2fb5..d17dfb676f 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -7,11 +7,6 @@ CONFIG_FEC_MXC
 CONFIG_MII
 	Must be defined if CONFIG_FEC_MXC is defined.
 
-CONFIG_FEC_XCV_TYPE
-	Defaults to MII100 for 100 Base-tx.
-	RGMII selects 1000 Base-tx reduced pin count interface.
-	RMII selects 100 Base-tx reduced pin count interface.
-
 CONFIG_FEC_MXC_SWAP_PACKET
 	Forced on iff MX28.
 	Swaps the bytes order of all words(4 byte units) in the packet.
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a26927582d..e8ebef0903 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -54,10 +54,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #error "CONFIG_MII has to be defined!"
 #endif
 
-#ifndef CONFIG_FEC_XCV_TYPE
-#define CONFIG_FEC_XCV_TYPE MII100
-#endif
-
 /*
  * The i.MX28 operates with packets in big endian. We need to swap them before
  * sending and after receiving.
@@ -1269,9 +1265,9 @@ static int fecmxc_probe(struct udevice *dev)
 		priv->xcv_type = RGMII;
 		break;
 	default:
-		priv->xcv_type = CONFIG_FEC_XCV_TYPE;
-		printf("Unsupported interface type %d defaulting to %d\n",
-		       priv->interface, priv->xcv_type);
+		priv->xcv_type = MII100;
+		printf("Unsupported interface type %d defaulting to MII100\n",
+		       priv->interface);
 		break;
 	}
 
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index f43e166c90..71a80f38bb 100644
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -122,7 +122,6 @@
 #define CONFIG_FEC_ENET_DEV 0
 #define IMX_FEC_BASE			0x5b040000
 #define CONFIG_FEC_MXC_PHYADDR          0x4
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define PHY_ANEG_TIMEOUT 20000
 
 #endif /* __APALIS_IMX8X_H */
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 96792028e0..fcf364be8d 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -21,8 +21,6 @@
 #define CONSOLE_DEV	"ttymxc0"
 #endif
 
-#define CONFIG_FEC_XCV_TYPE		RGMII
-
 /* Framebuffer */
 #define CONFIG_SYS_LDB_CLOCK	28341000
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 4f89f9d9ef..92f69ba9b0 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -87,7 +87,6 @@ BUR_COMMON_ENV \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Ethernet */
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_FIXED_SPEED		_1000BASET
 
 /* USB Configs */
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index c521dddab7..58d7a3a8ce 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -32,9 +32,6 @@
 
 #define CONFIG_FACTORYSET
 
-/* ENET Config */
-#define CONFIG_FEC_XCV_TYPE		RMII
-
 /* ENET1 connects to base board and MUX with ESAI */
 #define CONFIG_FEC_ENET_DEV		1
 #define CONFIG_FEC_MXC_PHYADDR		0x0
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index ce36b2e3ea..bd5c072382 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -136,7 +136,6 @@
 
 /* Networking */
 #define CONFIG_FEC_MXC_PHYADDR		-1
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define FEC_QUIRK_ENET_MAC
 
 #endif /* __CGTQMX8_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 0b059d7ab8..8af80f58f8 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -13,7 +13,6 @@
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 
 /* ENET1 */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index e41c76bfb9..90720c2f9b 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -147,7 +147,6 @@
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR		0
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 
 /* USB */
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 804dfb4480..3d3fab517e 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,7 +32,6 @@
 
 /* FEC ethernet */
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		7
 
 /* MMC Configs */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index e6fc65e0d4..65f8944cca 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -23,7 +23,6 @@
 
 
 /* Ethernet Configs */
-#define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_FEC_MXC_PHYADDR         0
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index c97223eb29..cd1eafdd5c 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -151,7 +151,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 2c568a6854..e4805951fa 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -105,7 +105,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
 /* FEC*/
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 #define IMX_FEC_BASE			0x30BE0000
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 4f5fe6a787..32c937abb0 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -83,7 +83,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 374b476d12..1ec27f40f2 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -101,7 +101,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
 /* FEC */
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 227cfda3e6..7fed9a38c1 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -122,7 +122,6 @@
 
 /* ENET Config */
 #if defined(CONFIG_FEC_MXC)
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR	0
 #define FEC_QUIRK_ENET_MAC
 #define IMX_FEC_BASE			0x30BE0000
diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
index 1540e4b49a..318289b76b 100644
--- a/include/configs/imx8mn_var_som.h
+++ b/include/configs/imx8mn_var_som.h
@@ -32,11 +32,6 @@
 
 #include <config_distro_bootcmd.h>
 
-/* ENET */
-#if defined(CONFIG_FEC_MXC)
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#endif /* CONFIG_FEC_MXC */
-
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index 1476431943..c01a590c8a 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
 /* FEC */
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index f08193a7f3..fe07a3cde6 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -33,7 +33,6 @@
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          1
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 287782b246..62e06d2303 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -41,7 +41,6 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          4
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 4140dd7a9d..8fff3bf632 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -38,7 +38,6 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 9d56e33e84..6919f6d660 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -32,7 +32,6 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index c12f383655..0fe38e61c4 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -133,7 +133,4 @@
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
-/* Networking */
-#define CONFIG_FEC_XCV_TYPE		RGMII
-
 #endif /* __IMX8QM_MEK_H */
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 5fcc96325a..7532c6e755 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -127,8 +127,5 @@
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
-/* Networking */
-#define CONFIG_FEC_XCV_TYPE		RGMII
-
 #include <linux/stringify.h>
 #endif /* __IMX8QM_ROM7720_H */
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index b1c51e72bf..beb35c9343 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -136,9 +136,6 @@
 #define CONFIG_PCA953X
 #endif
 
-/* Networking */
-#define CONFIG_FEC_XCV_TYPE		RGMII
-
 /* Misc configuration */
 #define CONFIG_SYS_CBSIZE	2048
 #define CONFIG_SYS_MAXARGS	64
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 07d8d65f71..ddb3d444f0 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -31,7 +31,6 @@
 #if defined(CONFIG_FEC_MXC)
 #define PHY_ANEG_TIMEOUT		20000
 
-#define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_FEC_MXC_PHYADDR		1
 
 #define IMX_FEC_BASE			0x29950000
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index e2c14c7373..2c0ad96e0d 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -32,7 +32,6 @@
 
 /* ENET1 Config */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 8d062aa463..d0960bcaf9 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -115,7 +115,6 @@
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR		0x0
-#define CONFIG_FEC_XCV_TYPE		RMII
 #endif
 
 #endif
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 9ec249722c..dd803e7053 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -72,7 +72,6 @@
 #define IMX_FEC_BASE			FEC_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR		0x0
 #define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE		RMII
 #endif
 
 #define CONFIG_SYS_RTC_BUS_NUM		1 /* I2C2 */
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index c2cf1f34ce..372cf8dd71 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -101,8 +101,6 @@
 #define IMX_FEC_BASE			ENET2_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_FEC_XCV_TYPE             RGMII
-
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 7ab641f7c0..a46f515f10 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -129,8 +129,6 @@
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR          0x1
 
-#define CONFIG_FEC_XCV_TYPE             RGMII
-
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index fdea1cbc28..4be5d7897d 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -137,11 +137,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             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		RMII
 #endif
 #endif
 
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 7a513c1ba9..8dcc45c9e5 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -94,13 +94,6 @@
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
-/* FEC Ethernet on SoC */
-#ifdef CONFIG_FEC_MXC
-#ifndef CONFIG_FEC_XCV_TYPE
-#define CONFIG_FEC_XCV_TYPE		RMII
-#endif
-#endif
-
 /* NAND */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index d082fbd824..afa4ca5b5a 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -29,7 +29,6 @@
 #endif
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 31cf63d864..1e40fad964 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -48,7 +48,6 @@
 #ifdef CONFIG_CMD_NET
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR		0x1
-#define CONFIG_FEC_XCV_TYPE		RMII
 #endif
 
 #define CONFIG_FEC_ENET_DEV		1
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 72515a32e1..7777935ba6 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -17,10 +17,6 @@
 #	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
-#if IS_ENABLED(CONFIG_FEC_MXC)
-#	define CONFIG_FEC_XCV_TYPE	RMII
-#endif /* CONFIG_FEC_MXC */
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 4f9a0f0301..63f6b149d0 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -130,7 +130,6 @@
 
 /* Ethernet Configuration */
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		1
 
 /* Framebuffer */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index d87bcf45d6..f63ebb4811 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -29,7 +29,6 @@
 
 #define IMX_FEC_BASE			ENET2_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR		0x1
-#define CONFIG_FEC_XCV_TYPE		RMII
 
 #define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
 
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 85f6129337..26946cd65a 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -32,7 +32,6 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		1
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index a9e8c264e9..9946fe92fb 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -80,7 +80,6 @@
 #ifdef CONFIG_CMD_NET
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR		0x1
-#define CONFIG_FEC_XCV_TYPE		RMII
 #endif
 
 #endif
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 4233ecd64e..899c218727 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
-#define CONFIG_FEC_XCV_TYPE		RGMII
-
 #define CONFIG_FEC_MXC_PHYADDR		0x03
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 88a652e6d0..90db96599c 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -7,7 +7,6 @@
 #define __CONFIG_TQMA6_WRU4_H
 
 /* Ethernet */
-#define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 4811e98810..de84e3b663 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -103,7 +103,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
 /* ENET */
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          7
 #define FEC_QUIRK_ENET_MAC
 #define IMX_FEC_BASE			0x30BE0000
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 6bfc121d10..9a7dedf1ea 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -35,7 +35,6 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		7
 #define FEC_QUIRK_ENET_MAC
 
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index d90c2fa053..ebae8223fe 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_FSL_ESDHC_NUM	1
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 
 /* I2C Configs */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 521f325057..e101739858 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -47,8 +47,6 @@
 #define IMX_FEC_BASE			ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_FEC_XCV_TYPE             RMII
-
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 91f6d67d27..13cfa2cd4b 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -45,7 +45,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             RMII
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
 #define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
-- 
2.39.5