From c2388cd14201a9ff8bcf5fd57ebf24d4ac9ab069 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Thu, 22 Feb 2024 16:38:59 -0800
Subject: [PATCH] Fix for NXP T1024 PHY address mapping. Add ability to
 override macros.

---
 hal/nxp_t1024.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/hal/nxp_t1024.c b/hal/nxp_t1024.c
index afe1c8e92..993f9c18b 100644
--- a/hal/nxp_t1024.c
+++ b/hal/nxp_t1024.c
@@ -2558,12 +2558,24 @@ static int hal_phy_init(struct phy_device *phydev)
 }
 
 
+#ifndef RGMII_PHY1_ADDR
 #define RGMII_PHY1_ADDR        0x4
+#endif
+#ifndef RGMII_PHY2_ADDR
 #define RGMII_PHY2_ADDR        0x3
-#define SGMII_PHY2_ADDR        0x1
-#define SGMII_PHY1_ADDR        0x2
+#endif
+#ifndef SGMII_PHY2_ADDR
+#define SGMII_PHY2_ADDR        0x2
+#endif
+#ifndef SGMII_PHY1_ADDR
+#define SGMII_PHY1_ADDR        0x1
+#endif
+#ifndef SGMII_AQR_PHY_ADDR
 #define SGMII_AQR_PHY_ADDR     0x2
+#endif
+#ifndef FM1_10GEC1_PHY_ADDR
 #define FM1_10GEC1_PHY_ADDR    0x1
+#endif
 
 #define FM1_DTSEC1 0
 #define FM1_DTSEC2 1