diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/board.c b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/board.c index 4b7c6b157..34051709d 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/board.c +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/board.c @@ -14,7 +14,7 @@ * @file board.c * @brief support cortex-m7-emulator-board init configure and start-up * @version 1.0 -* @author fudan +* @author AIIT XUOS Lab * @date 2023-09-27 */ @@ -198,8 +198,5 @@ void InitBoardHardware() KPrintf("board init done.\n"); KPrintf("start kernel...\n"); -#ifdef TOOL_USING_OTA - //跳转成功设置lastjumpflag为JUMP_SUCCESS_FLAG - app_clear_jumpflag(); -#endif + } diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link.lds b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link.lds index b71abc9fd..74e24c01a 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link.lds +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link.lds @@ -28,18 +28,18 @@ /** * @file link.lds -* @brief xidatong-arm32 Linker script +* @brief cortex-m7 emulator Linker script * @version 1.0 * @author AIIT XUOS Lab -* @date 2021-05-28 +* @date 2021-09-27 */ /************************************************* File name: link.lds -Description: xidatong-arm32 Linker script +Description: cortex-m7 emulator Linker script Others: take MIMXRT1052xxxxx_flexspi_nor.ld for references History: -1. Date: 2021-05-28 +1. Date: 2021-09-27 Author: AIIT XUOS Lab Modification: 1. add shell cmd table and g_service_table diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link_m7.lds b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link_m7.lds index b71abc9fd..511735325 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link_m7.lds +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/link_m7.lds @@ -28,18 +28,18 @@ /** * @file link.lds -* @brief xidatong-arm32 Linker script +* @brief cortex-m7 emulator Linker script * @version 1.0 * @author AIIT XUOS Lab -* @date 2021-05-28 +* @date 2021-09-27 */ /************************************************* File name: link.lds -Description: xidatong-arm32 Linker script +Description:cortex-m7 emulator Linker script Others: take MIMXRT1052xxxxx_flexspi_nor.ld for references History: -1. Date: 2021-05-28 +1. Date: 2021-09-27 Author: AIIT XUOS Lab Modification: 1. add shell cmd table and g_service_table diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_gpio.h b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_gpio.h index f9da70b31..6f4316e2e 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_gpio.h +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_gpio.h @@ -12,10 +12,10 @@ /** * @file connect_gpio.h -* @brief define imxrt1052-board gpio function and struct +* @brief define m7 emulator gpio function and struct * @version 2.0 * @author AIIT XUOS Lab -* @date 2022-03-15 +* @date 2023-09-27 */ #ifndef __CONNECT_GPIO_H_ diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_uart.h b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_uart.h index 4b4c947a8..f9e33e320 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_uart.h +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m7-emulator/third_party_driver/include/connect_uart.h @@ -12,10 +12,10 @@ /** * @file connect_uart.h -* @brief define imxrt1052-board usart function and struct +* @brief define m7 emulator usart function and struct * @version 2.0 * @author AIIT XUOS Lab -* @date 2022-03-15 +* @date 2023-09-27 */ #ifndef CONNECT_UART_H diff --git a/Ubiquitous/XiZi_IIoT/path_kernel.mk b/Ubiquitous/XiZi_IIoT/path_kernel.mk index 23cc92714..6663617b7 100755 --- a/Ubiquitous/XiZi_IIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_IIoT/path_kernel.mk @@ -41,8 +41,6 @@ KERNELPATHS += \ -I$(KERNEL_ROOT)/include \ -I$(KERNEL_ROOT)/resources/include - - ifeq ($(CONFIG_RESOURCES_LWIP),y) KERNELPATHS += \ -I$(KERNEL_ROOT)/resources/ethernet/LwIP/include \ diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/Makefile b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/Makefile index 3b2116a85..b59cbd62e 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/Makefile +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/Makefile @@ -2,16 +2,12 @@ SRC_DIR += api SRC_DIR += arch SRC_DIR += core SRC_DIR += netif - - SRC_DIR += apps LWIP_DIR += api LWIP_DIR += arch LWIP_DIR += core LWIP_DIR += netif - - LWIP_DIR += apps include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h index 7ee9d1273..ee9a40abc 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h @@ -46,7 +46,6 @@ // #define LWIP_API_MSG_DEBUG #endif - #ifdef LWIP_DEBUG #ifdef LWIP_SYS_DEBUG #define SYS_DEBUG LWIP_DBG_ON