Skip to contentSkip to conversation

configs: remove FEC_QUIRK_ENET_MAC from imx8m configs

PATCH New Tim Harvey 2 participants 2 messages Apr 29, 2022 – May 20, 2022 Arm i.MX and Layerscape

lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH 1/1 configs: remove FEC_QUIRK_ENET_MAC from imx8m configs

FEC_QUIRK_ENET_MAC is defined in the imx-regs.h include file and thus does not need to be defined in the various board config includes.

---
 include/configs/cgtqmx8.h                   | 1 -
 include/configs/imx8mm-cl-iot-gate.h        | 1 -
 include/configs/imx8mm_data_modul_edm_sbc.h | 1 -
 include/configs/imx8mm_evk.h                | 1 -
 include/configs/imx8mm_venice.h             | 3 ---
 include/configs/imx8mn_venice.h             | 3 ---
 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/kontron-sl-mx8mm.h          | 2 --
 include/configs/kontron_pitx_imx8m.h        | 1 -
 include/configs/pico-imx8mq.h               | 1 -
 include/configs/verdin-imx8mm.h             | 1 -
 include/configs/verdin-imx8mp.h             | 1 -
 15 files changed, 20 deletions(-)
include/configs/cgtqmx8.h +0 -1
index 6da0483ef09a..4c04bbf64471 100644
@@ -132,6 +132,5 @@
 
 /* Networking */
 #define CONFIG_FEC_MXC_PHYADDR		-1
-#define FEC_QUIRK_ENET_MAC
 
 #endif /* __CGTQMX8_H */
include/configs/imx8mm-cl-iot-gate.h +0 -1
index c20c32b6951f..a283f70168f8 100644
@@ -160,7 +160,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 
 #define CONFIG_FEC_MXC_PHYADDR		0
-#define FEC_QUIRK_ENET_MAC
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/imx8mm_data_modul_edm_sbc.h +0 -1
index 33778a2365e9..de56640cd84a 100644
@@ -52,7 +52,6 @@
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
-#define FEC_QUIRK_ENET_MAC
 
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM	2
include/configs/imx8mm_evk.h +0 -1
index 42b78485cfcf..b8a6d8062e26 100644
@@ -78,6 +78,5 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 #define CONFIG_FEC_MXC_PHYADDR          0
-#define FEC_QUIRK_ENET_MAC
 
 #endif
include/configs/imx8mm_venice.h +0 -3
index 28417c55b9b6..b11477d6f3a0 100644
@@ -111,7 +111,4 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-/* FEC */
-#define FEC_QUIRK_ENET_MAC
-
 #endif
include/configs/imx8mn_venice.h +0 -3
index 0379c27f11a5..d0188592dfbf 100644
@@ -107,7 +107,4 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-/* FEC */
-#define FEC_QUIRK_ENET_MAC
-
 #endif
include/configs/imx8mp_evk.h +0 -1
index cc8d65cb54ed..4acfdde09e91 100644
@@ -32,7 +32,6 @@
 
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          1
-#define FEC_QUIRK_ENET_MAC
 
 #define DWC_NET_PHYADDR			1
 
include/configs/imx8mp_rsb3720.h +0 -1
index c5dd545471e1..4ccf6935ed2a 100644
@@ -51,7 +51,6 @@
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          4
-#define FEC_QUIRK_ENET_MAC
 
 #define DWC_NET_PHYADDR			4
 #ifdef CONFIG_DWC_ETH_QOS
include/configs/imx8mq_evk.h +0 -1
index f7929e5867e9..17d7765f7b1f 100644
@@ -37,7 +37,6 @@
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          0
-#define FEC_QUIRK_ENET_MAC
 #endif
 
 #ifndef CONFIG_SPL_BUILD
include/configs/imx8mq_phanbell.h +0 -1
index f6410114b765..7a8fedc9fc73 100644
@@ -31,7 +31,6 @@
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          0
-#define FEC_QUIRK_ENET_MAC
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \
include/configs/kontron-sl-mx8mm.h +0 -2
index 1b429f7dbe22..81c365873136 100644
@@ -70,8 +70,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x930000
 #endif
 
-#define FEC_QUIRK_ENET_MAC
-
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=0x42000000\0" \
include/configs/kontron_pitx_imx8m.h +0 -1
index e8e92920dcbc..d0d93f0eb4df 100644
@@ -38,7 +38,6 @@
 /* ENET1 Config */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          0
-#define FEC_QUIRK_ENET_MAC
 
 #define PHY_ANEG_TIMEOUT		20000
 
include/configs/pico-imx8mq.h +0 -1
index 95845276e7b4..42c7bf7ee8c7 100644
@@ -31,7 +31,6 @@
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR		1
-#define FEC_QUIRK_ENET_MAC
 #endif
 
 /* Initial environment variables */
include/configs/verdin-imx8mm.h +0 -1
index da3dc95f9ee1..100b663a7422 100644
@@ -95,7 +95,6 @@
 
 /* ENET */
 #define CONFIG_FEC_MXC_PHYADDR          7
-#define FEC_QUIRK_ENET_MAC
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/verdin-imx8mp.h +0 -1
index 7b7407752c15..210705638231 100644
@@ -36,7 +36,6 @@
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR		7
-#define FEC_QUIRK_ENET_MAC
 
 #define PHY_ANEG_TIMEOUT 20000
 #endif /* CONFIG_CMD_NET */
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 configs: remove FEC_QUIRK_ENET_MAC from imx8m configs

Quoted 3 lines

FEC_QUIRK_ENET_MAC is defined in the imx-regs.h include file and thus does not need to be defined in the various board config includes.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================