Skip to contentSkip to conversation

include: configs: *imx8*: remove IMX_FEC_BASE

PATCH In review Heiko Thiery 5 participants 5 messages Feb 18, 2022 – Apr 12, 2022 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include: configs: *imx8*: remove IMX_FEC_BASE

The IMX_FEC_BASE value is not used when CONFIG_DM_ETH is configured. So this value can be removed.

---
 include/configs/imx8mm-cl-iot-gate.h | 2 --
 include/configs/imx8mm_beacon.h      | 1 -
 include/configs/imx8mm_evk.h         | 2 --
 include/configs/imx8mm_venice.h      | 1 -
 include/configs/imx8mn_beacon.h      | 1 -
 include/configs/imx8mq_evk.h         | 2 --
 include/configs/imx8mq_phanbell.h    | 2 --
 include/configs/imx8ulp_evk.h        | 2 --
 include/configs/kontron_pitx_imx8m.h | 1 -
 include/configs/pico-imx8mq.h        | 2 --
 include/configs/verdin-imx8mm.h      | 1 -
 11 files changed, 17 deletions(-)
include/configs/imx8mm-cl-iot-gate.h +0 -2
index 7e6be6050c..4413bdcc58 100644
@@ -157,8 +157,6 @@
 #define CONFIG_FEC_MXC_PHYADDR		0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE			0x30BE0000
-
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/imx8mm_beacon.h +0 -1
index 77f062474d..029e8c4c7f 100644
@@ -109,6 +109,5 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE			0x30BE0000
 
 #endif
include/configs/imx8mm_evk.h +0 -2
index c7022ef0f7..771eaf80d5 100644
@@ -89,6 +89,4 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE			0x30BE0000
-
 #endif
include/configs/imx8mm_venice.h +0 -1
index 7ab11cc8fb..a828f48d2e 100644
@@ -109,6 +109,5 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE			0x30BE0000
 
 #endif
include/configs/imx8mn_beacon.h +0 -1
index e2e322bb4d..e54b87c76a 100644
@@ -126,7 +126,6 @@
 #define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR	0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE			0x30BE0000
 #endif /* CONFIG_FEC_MXC */
 
 #endif
include/configs/imx8mq_evk.h +0 -2
index 4aaed3ae7d..1a472588ac 100644
@@ -43,8 +43,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE			0x30BE0000
 #endif
 
 #ifndef CONFIG_SPL_BUILD
include/configs/imx8mq_phanbell.h +0 -2
index 16a2c2cf9d..1e1c186aed 100644
@@ -37,8 +37,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE			0x30BE0000
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \
include/configs/imx8ulp_evk.h +0 -2
index 7da6802aa5..666306c028 100644
@@ -34,8 +34,6 @@
 
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_FEC_MXC_PHYADDR		1
-
-#define IMX_FEC_BASE			0x29950000
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/kontron_pitx_imx8m.h +0 -1
index 0f96b905ab..6f426cb08c 100644
@@ -43,7 +43,6 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE			0x30BE0000
 #define PHY_ANEG_TIMEOUT		20000
 
 #endif
include/configs/pico-imx8mq.h +0 -2
index 7bfa79059a..08204779d8 100644
@@ -37,8 +37,6 @@
 #define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		1
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE			0x30BE0000
 #endif
 
 /* Initial environment variables */
include/configs/verdin-imx8mm.h +0 -1
index 17583c0a6a..859b62d6f7 100644
@@ -107,7 +107,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          7
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE			0x30BE0000
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 154 lines · Heiko Thiery

The IMX_FEC_BASE value is not used when CONFIG_DM_ETH is configured. So this value can be removed.

---
 include/configs/imx8mm-cl-iot-gate.h | 2 --
 include/configs/imx8mm_beacon.h      | 1 -
 include/configs/imx8mm_evk.h         | 2 --
 include/configs/imx8mm_venice.h      | 1 -
 include/configs/imx8mn_beacon.h      | 1 -
 include/configs/imx8mq_evk.h         | 2 --
 include/configs/imx8mq_phanbell.h    | 2 --
 include/configs/imx8ulp_evk.h        | 2 --
 include/configs/kontron_pitx_imx8m.h | 1 -
 include/configs/pico-imx8mq.h        | 2 --
 include/configs/verdin-imx8mm.h      | 1 -
 11 files changed, 17 deletions(-)
include/configs/imx8mm-cl-iot-gate.h +0 -2
index 7e6be6050c..4413bdcc58 100644
@@ -157,8 +157,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE                   0x30BE0000
-
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/imx8mm_beacon.h +0 -1
index 77f062474d..029e8c4c7f 100644
@@ -109,6 +109,5 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000
 
 #endif
include/configs/imx8mm_evk.h +0 -2
index c7022ef0f7..771eaf80d5 100644
@@ -89,6 +89,4 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE                   0x30BE0000
-
 #endif
include/configs/imx8mm_venice.h +0 -1
index 7ab11cc8fb..a828f48d2e 100644
@@ -109,6 +109,5 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000
 
 #endif
include/configs/imx8mn_beacon.h +0 -1
index e2e322bb4d..e54b87c76a 100644
@@ -126,7 +126,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_FEC_MXC_PHYADDR 0
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000
 #endif /* CONFIG_FEC_MXC */
 
 #endif
include/configs/imx8mq_evk.h +0 -2
index 4aaed3ae7d..1a472588ac 100644
@@ -43,8 +43,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
 #endif
 
 #ifndef CONFIG_SPL_BUILD
include/configs/imx8mq_phanbell.h +0 -2
index 16a2c2cf9d..1e1c186aed 100644
@@ -37,8 +37,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \
include/configs/imx8ulp_evk.h +0 -2
index 7da6802aa5..666306c028 100644
@@ -34,8 +34,6 @@
 
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_FEC_MXC_PHYADDR         1
-
-#define IMX_FEC_BASE                   0x29950000
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/kontron_pitx_imx8m.h +0 -1
index 0f96b905ab..6f426cb08c 100644
@@ -43,7 +43,6 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define FEC_QUIRK_ENET_MAC
 
-#define IMX_FEC_BASE                   0x30BE0000
 #define PHY_ANEG_TIMEOUT               20000
 
 #endif
include/configs/pico-imx8mq.h +0 -2
index 7bfa79059a..08204779d8 100644
@@ -37,8 +37,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_FEC_MXC_PHYADDR         1
 #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
 #endif
 
 /* Initial environment variables */
include/configs/verdin-imx8mm.h +0 -2
index 17583c0a6a..859b62d6f7 100644
@@ -107,7 +107,6 @@
 #define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          7
 #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--
Quoted 2 lines

2.20.1

Heiko,

Thanks for the cleanup!

Best Regards,

Tim

Tested-by on v1 1/1
#3 lore raw
In reply to Heiko Thiery
Quoted 9 lines · Heiko Thiery

The IMX_FEC_BASE value is not used when CONFIG_DM_ETH is configured. So this value can be removed.

---
 include/configs/imx8mm-cl-iot-gate.h | 2 --
 include/configs/imx8mm_beacon.h      | 1 -
 include/configs/imx8mm_evk.h         | 2 --
 include/configs/imx8mm_venice.h      | 1 -

Looks good. However, Tim already did this for the venice [1] which is why it no longer applies cleanly.

With that fixed.

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

Quoted 143 lines

 include/configs/imx8mn_beacon.h      | 1 -
 include/configs/imx8mq_evk.h         | 2 --
 include/configs/imx8mq_phanbell.h    | 2 --
 include/configs/imx8ulp_evk.h        | 2 --
 include/configs/kontron_pitx_imx8m.h | 1 -
 include/configs/pico-imx8mq.h        | 2 --
 include/configs/verdin-imx8mm.h      | 1 -

 11 files changed, 17 deletions(-)
include/configs/imx8mm-cl-iot-gate.h +0 -0
index 7e6be6050c..4413bdcc58 100644
@@ -157,8 +157,6 @@
  #define CONFIG_FEC_MXC_PHYADDR         0
  #define FEC_QUIRK_ENET_MAC

include/configs/imx8mm-cl-iot-gate.h +0 -2
-#define IMX_FEC_BASE                   0x30BE0000
-

 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

include/configs/imx8mm_beacon.h +0 -1
index 77f062474d..029e8c4c7f 100644
@@ -109,6 +109,5 @@
  #define CONFIG_FEC_XCV_TYPE             RGMII
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000


 #endif

include/configs/imx8mm_evk.h +0 -0
index c7022ef0f7..771eaf80d5 100644
@@ -89,6 +89,4 @@
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC

include/configs/imx8mm_evk.h +0 -2
-#define IMX_FEC_BASE                   0x30BE0000
-

 #endif

include/configs/imx8mm_venice.h +0 -1
index 7ab11cc8fb..a828f48d2e 100644
@@ -109,6 +109,5 @@
  #define CONFIG_FEC_XCV_TYPE             RGMII
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000


 #endif

include/configs/imx8mn_beacon.h +0 -1
index e2e322bb4d..e54b87c76a 100644
@@ -126,7 +126,6 @@
  #define CONFIG_FEC_XCV_TYPE            RGMII
  #define CONFIG_FEC_MXC_PHYADDR 0
  #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000
  #endif /* CONFIG_FEC_MXC */


 #endif

include/configs/imx8mq_evk.h +0 -2
index 4aaed3ae7d..1a472588ac 100644
@@ -43,8 +43,6 @@
  #define CONFIG_FEC_XCV_TYPE             RGMII
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
  #endif


 #ifndef CONFIG_SPL_BUILD

include/configs/imx8mq_phanbell.h +0 -2
index 16a2c2cf9d..1e1c186aed 100644
@@ -37,8 +37,6 @@
  #define CONFIG_FEC_XCV_TYPE             RGMII
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
  #endif


 #define CONFIG_MFG_ENV_SETTINGS \

include/configs/imx8ulp_evk.h +0 -0
index 7da6802aa5..666306c028 100644
@@ -34,8 +34,6 @@


 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_FEC_MXC_PHYADDR         1

include/configs/imx8ulp_evk.h +0 -2
-
-#define IMX_FEC_BASE                   0x29950000

 #endif

 #ifdef CONFIG_DISTRO_DEFAULTS

include/configs/kontron_pitx_imx8m.h +0 -0
index 0f96b905ab..6f426cb08c 100644
@@ -43,7 +43,6 @@
  #define CONFIG_FEC_MXC_PHYADDR          0
  #define FEC_QUIRK_ENET_MAC


-#define IMX_FEC_BASE                   0x30BE0000 #define PHY_ANEG_TIMEOUT               20000
 #endif

include/configs/pico-imx8mq.h +0 -2
index 7bfa79059a..08204779d8 100644
@@ -37,8 +37,6 @@
  #define CONFIG_FEC_XCV_TYPE            RGMII
  #define CONFIG_FEC_MXC_PHYADDR         1
  #define FEC_QUIRK_ENET_MAC
-
-#define IMX_FEC_BASE                   0x30BE0000
  #endif


 /* Initial environment variables */

include/configs/verdin-imx8mm.h +0 -1
index 17583c0a6a..859b62d6f7 100644
@@ -107,7 +107,6 @@
  #define CONFIG_FEC_XCV_TYPE             RGMII
  #define CONFIG_FEC_MXC_PHYADDR          7
  #define FEC_QUIRK_ENET_MAC
-#define IMX_FEC_BASE                   0x30BE0000


 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

#4 lore raw

PATCH 1/1 include: configs: *imx8*: remove IMX_FEC_BASE

In reply to Heiko Thiery
Quoted 6 lines

The IMX_FEC_BASE value is not used when CONFIG_DM_ETH is configured. So this value can be removed.

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]
=====================================================================