This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 08f41244bc5550d57a49013afb9c16c559af4fe1
Author: George Poulios <gpoul...@census-labs.com>
AuthorDate: Wed Jun 4 11:11:02 2025 +0300
boards/imx93-evk: Tidy up board.h ENET1 section
i.MX93 EVK board.h had an unmatched #endif directive
accidentally matching the top-level header file guard.
It also had a dual definition of BOARD_ENET1_PHY_LIST
with the same values. None of these issues affect the
functionality, as they ended up (almost) with equivalent
end result.
Signed-off-by: George Poulios <gpoul...@census-labs.com>
---
boards/arm64/imx9/imx93-evk/include/board.h | 48 +++++++++--------------------
1 file changed, 15 insertions(+), 33 deletions(-)
diff --git a/boards/arm64/imx9/imx93-evk/include/board.h
b/boards/arm64/imx9/imx93-evk/include/board.h
index 20b165b2c8..a4c9d3f068 100644
--- a/boards/arm64/imx9/imx93-evk/include/board.h
+++ b/boards/arm64/imx9/imx93-evk/include/board.h
@@ -158,28 +158,26 @@
/* Ethernet configuration */
+#ifdef CONFIG_IMX9_ENET1
+
#define BOARD_ENET1_PHY_LIST \
{ \
{ \
- .name = GMII_RTL8211F_NAME, \
- .id1 = GMII_PHYID1_RTL8211F, \
- .id2 = GMII_PHYID2_RTL8211F, \
- .status = GMII_RTL8211F_PHYSR_A43, \
- .address_lo = 2, \
- .address_high = 0xffff, \
- .mbps10 = GMII_RTL8211F_PHYSR_10MBPS, \
- .mbps100 = GMII_RTL8211F_PHYSR_100MBPS, \
- .duplex = GMII_RTL8211F_PHYSR_DUPLEX, \
- .clause = 22, \
- .mbps1000 = GMII_RTL8211F_PHYSR_1000MBPS, \
- .speed_mask = GMII_RTL8211F_PHYSR_SPEED_MASK, \
+ .name = GMII_RTL8211F_NAME, \
+ .id1 = GMII_PHYID1_RTL8211F, \
+ .id2 = GMII_PHYID2_RTL8211F, \
+ .status = GMII_RTL8211F_PHYSR_A43, \
+ .address_lo = 2, \
+ .address_high = 0xffff, \
+ .mbps10 = GMII_RTL8211F_PHYSR_10MBPS, \
+ .mbps100 = GMII_RTL8211F_PHYSR_100MBPS, \
+ .duplex = GMII_RTL8211F_PHYSR_DUPLEX, \
+ .clause = 22, \
+ .mbps1000 = GMII_RTL8211F_PHYSR_1000MBPS, \
+ .speed_mask = GMII_RTL8211F_PHYSR_SPEED_MASK, \
}, \
}
-#endif /* CONFIG_IMX9_ENET1 */
-
-#ifdef CONFIG_IMX9_ENET1
-
#define MUX_ENET1_MDIO IOMUX_CFG(IOMUXC_PAD_ENET2_MDIO_ENET1_MDIO,
IOMUXC_PAD_FSEL_FAST | IOMUXC_PAD_DSE_X6, IOMUXC_MUX_SION_ON)
#define MUX_ENET1_MDC IOMUX_CFG(IOMUXC_PAD_ENET2_MDC_ENET1_MDC,
IOMUXC_PAD_FSEL_FAST | IOMUXC_PAD_DSE_X6, 0)
@@ -217,23 +215,7 @@
#error ENET1 supports only RMII and RGMII
#endif
-#define BOARD_ENET1_PHY_LIST \
-{ \
- { \
- GMII_RTL8211F_NAME, \
- GMII_PHYID1_RTL8211F, \
- GMII_PHYID2_RTL8211F, \
- GMII_RTL8211F_PHYSR_A43, \
- 2, \
- 0xffff, \
- GMII_RTL8211F_PHYSR_10MBPS, \
- GMII_RTL8211F_PHYSR_100MBPS, \
- GMII_RTL8211F_PHYSR_DUPLEX, \
- 22, \
- GMII_RTL8211F_PHYSR_1000MBPS, \
- GMII_RTL8211F_PHYSR_SPEED_MASK, \
- }, \
-}
+#endif /* CONFIG_IMX9_ENET1 */
/****************************************************************************
* Public Data
