Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong

Ubiquitous/XiZi/board/xidatong/board.c

@@ -59,6 +59,10 @@ extern int ExtSramInit(void);
 #endif
 #endif
 
+#ifdef BSP_USING_LWIP
+extern int ETH_BSP_Config();
+#endif
+
 void BOARD_SD_Pin_Config(uint32_t speed, uint32_t strength)
 {
     IOMUXC_SetPinConfig(IOMUXC_GPIO_SD_B0_00_USDHC1_CMD,
@@ -278,8 +282,10 @@ void InitBoardHardware()
     BOARD_InitPins();
     BOARD_BootClockRUN();
 
+#ifndef BSP_USING_LWIP
     NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
     SysTick_Config(SystemCoreClock / TICK_PER_SECOND);
+#endif
 
 #ifdef BSP_USING_GPIO
     Imxrt1052HwGpioInit();
@@ -307,6 +313,10 @@ void InitBoardHardware()
 #endif
 #endif
 
+#ifdef BSP_USING_LWIP
+    ETH_BSP_Config();
+#endif
+
 #ifdef BSP_USING_LPUART
     Imxrt1052HwUartInit();
 #endif

Ubiquitous/XiZi/board/xidatong/include/board.h

@@ -62,7 +62,7 @@ void InitBoardHardware(void);
 #define NVIC_PRIORITYGROUP_4         0x00000003U /*!< 4 bits for pre-emption priority*/
 
 /*! @brief The ENET PHY address. */
-#define BOARD_ENET0_PHY_ADDRESS (0x02U) /* Phy address of enet port 0. */
+#define BOARD_ENET0_PHY_ADDRESS (0x0U) /* Phy address of enet port 0. */
 
 /* USB PHY condfiguration */
 #define BOARD_USB_PHY_D_CAL (0x0CU)