From 5d4e4ae390b50299a1f80cc9507921ba4f7f03f4 Mon Sep 17 00:00:00 2001 From: guozhanxin Date: Wed, 10 Oct 2018 09:19:38 +0800 Subject: [PATCH] [bsp][imxrt] Remove SeeedStudio network dependencies --- bsp/imxrt/Libraries/imxrt1050/drivers/SConscript | 2 +- bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c | 6 +++--- bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.c | 2 +- bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsp/imxrt/Libraries/imxrt1050/drivers/SConscript b/bsp/imxrt/Libraries/imxrt1050/drivers/SConscript index 32d7aa708..7e9b391e3 100644 --- a/bsp/imxrt/Libraries/imxrt1050/drivers/SConscript +++ b/bsp/imxrt/Libraries/imxrt1050/drivers/SConscript @@ -54,7 +54,7 @@ if GetDepend('RT_USING_USB_DEVICE'): src += Glob('usb/phy/*.c') CPPDEFINES += ['ENDIANNESS'] -if GetDepend('BOARD_RT1050_EVK') or GetDepend('BOARD_RT1050_SeeedStudio'): +if GetDepend('BOARD_RT1050_EVK'): if GetDepend('RT_USING_LWIP'): src += ['drv_eth.c', 'fsl_phy.c'] CPPDEFINES += ['FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE'] diff --git a/bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c b/bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c index a884d8d06..6ea1e16d6 100644 --- a/bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c +++ b/bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c @@ -43,7 +43,7 @@ #define PHY_ADDRESS 0x00u #endif -#if defined(BOARD_RT1050_EVK) || defined(BOARD_RT1050_SeeedStudio) +#if defined(BOARD_RT1050_EVK) #define PHY_ADDRESS 0x02u #endif /* debug option */ @@ -137,7 +137,7 @@ void _enet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, break; } } -#if defined(BOARD_RT1050_SeeedStudio) || defined(BOARD_RT1050_EVK) +#if defined(BOARD_RT1050_EVK) static void evk_enet_io_init(void) { CLOCK_EnableClock(kCLOCK_Iomuxc); /* iomuxc clock (iomuxc_clk_enable): 0x03u */ @@ -1127,7 +1127,7 @@ static int rt_hw_imxrt_eth_init(void) fire_enet_io_init(); #endif -#if defined(BOARD_RT1050_EVK) || defined(BOARD_RT1050_SeeedStudio) +#if defined(BOARD_RT1050_EVK) evk_enet_io_init(); #endif _enet_clk_init(); diff --git a/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.c b/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.c index b10b1e6cd..a8f3d2f3b 100644 --- a/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.c +++ b/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.c @@ -328,7 +328,7 @@ status_t PHY_GetLinkSpeedDuplex(ENET_Type *base, uint32_t phyAddr, phy_speed_t * #if defined(BOARD_RT1050_FIRE) || defined(BOARD_RT1050_ATK) result = PHY_Read(base, phyAddr, PHY_CONTROL2_REG, &ctlReg); #endif -#if defined(BOARD_RT1050_EVK) || defined(BOARD_RT1050_SeeedStudio) +#if defined(BOARD_RT1050_EVK) result = PHY_Read(base, phyAddr, PHY_CONTROL1_REG, &ctlReg); #endif if (result == kStatus_Success) diff --git a/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.h b/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.h index a1b4f5f89..8de59535d 100644 --- a/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.h +++ b/bsp/imxrt/Libraries/imxrt1050/drivers/fsl_phy.h @@ -56,7 +56,7 @@ #if defined(BOARD_RT1050_FIRE) || defined(BOARD_RT1050_ATK) #define PHY_CONTROL_ID1 0x07U /*!< The PHY ID1*/ #endif -#if defined(BOARD_RT1050_EVK) || defined(BOARD_RT1050_SeeedStudio) +#if defined(BOARD_RT1050_EVK) #define PHY_CONTROL_ID1 0x22U /*!< The PHY ID1*/ #endif /*! @brief Defines the mask flag in basic control register. */ @@ -83,7 +83,7 @@ #define PHY_CTL1_LINKUP_MASK 0x100U /*!< The PHY link up. */ #define PHY_LINK_READY_MASK (PHY_CTL1_ENERGYDETECT_MASK | PHY_CTL1_LINKUP_MASK) #endif -#if defined(BOARD_RT1050_EVK) || defined(BOARD_RT1050_SeeedStudio) +#if defined(BOARD_RT1050_EVK) #define PHY_CTL2_REMOTELOOP_MASK 0x0004U /*!< The PHY remote loopback mask. */ #define PHY_CTL2_REFCLK_SELECT_MASK 0x0080U /*!< The PHY RMII reference clock select. */ #define PHY_CTL1_10HALFDUPLEX_MASK 0x0001U /*!< The PHY 10M half duplex mask. */ -- GitLab