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

2022-04-07 10:28:21 +08:00
parent 90f30cf6d2 8c76480a97
commit c7878e8b8a
861 changed files with 1198 additions and 454 deletions
@@ -7,7 +7,7 @@ endif

 ifeq ($(CONFIG_BOARD_STM32F103_NANO),y)
 SRC_DIR := shared
-SRC_DIR +=cortex-m3
+SRC_DIR += cortex-m3
 endif

 ifeq ($(CONFIG_BOARD_STM32F407_EVB),y)
@@ -15,6 +15,11 @@ SRC_DIR := shared
 SRC_DIR += cortex-m4
 endif

+ifeq ($(CONFIG_BOARD_CORTEX_M4_EVB),y)
+SRC_DIR := shared
+SRC_DIR += cortex-m4
+endif
+
 ifeq ($(CONFIG_BOARD_CORTEX_M7_EVB),y)
 SRC_DIR := shared
 SRC_DIR += cortex-m7