modify 4 Makefiles

maktiny · Jan 14, 2019 · d4a45fe · d4a45fe
1 parent ab62505
commit d4a45fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/targets/Mini_Project/cortex-m0plus_without_driver/GCC/Makefile b/targets/Mini_Project/cortex-m0plus_without_driver/GCC/Makefile
@@ -83,7 +83,8 @@ CMSIS_SRC =  \
         C_SOURCES += $(CMSIS_SRC)
 
 ARCH_SRC =  \
-        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c}
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c} \
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/cortex-m0/*.c}
         C_SOURCES += $(ARCH_SRC)
 
 ifeq ($(WITH_LWIP), yes)
@@ -293,7 +294,8 @@ LWM2M_ATINY_INC = \
 
 ARCH_INC = \
         -I $(TOP_DIR)/arch/arm/arm-m/include \
-	-I $(TOP_DIR)/arch/arm/common/cmsis
+	-I $(TOP_DIR)/arch/arm/common/cmsis \
+	-I $(TOP_DIR)/arch/arm/arm-m/cortex-m0
         C_INCLUDES += $(ARCH_INC)
 
 LITEOS_CMSIS = \

diff --git a/targets/Mini_Project/cortex-m3_without_driver/GCC/Makefile b/targets/Mini_Project/cortex-m3_without_driver/GCC/Makefile
@@ -83,7 +83,8 @@ CMSIS_SRC =  \
         C_SOURCES += $(CMSIS_SRC)
 
 ARCH_SRC =  \
-        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c}
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c} \
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/cortex-m3/*.c}
         C_SOURCES += $(ARCH_SRC)
 
 ifeq ($(WITH_LWIP), yes)
@@ -294,7 +295,8 @@ LWM2M_ATINY_INC = \
 
 ARCH_INC = \
         -I $(TOP_DIR)/arch/arm/arm-m/include \
-	-I $(TOP_DIR)/arch/arm/common/cmsis
+	-I $(TOP_DIR)/arch/arm/common/cmsis \
+	-I $(TOP_DIR)/arch/arm/arm-m/cortex-m3
         C_INCLUDES += $(ARCH_INC)
 
 LITEOS_CMSIS = \

diff --git a/targets/Mini_Project/cortex-m4_without_driver/GCC/Makefile b/targets/Mini_Project/cortex-m4_without_driver/GCC/Makefile
@@ -87,7 +87,8 @@ CMSIS_SRC =  \
         C_SOURCES += $(CMSIS_SRC)
 
 ARCH_SRC =  \
-        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c}
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c} \
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/cortex-m4/*.c}
         C_SOURCES += $(ARCH_SRC)
 
 ifeq ($(WITH_LWIP), yes)
@@ -321,7 +322,8 @@ KERNEL_INC = \
         C_INCLUDES += $(KERNEL_INC)
 
 ARCH_INC = \
-        -I $(TOP_DIR)/arch/arm/arm-m/include
+        -I $(TOP_DIR)/arch/arm/arm-m/include \
+        -I $(TOP_DIR)/arch/arm/arm-m/cortex-m4
         C_INCLUDES += $(ARCH_INC)
 
 LITEOS_CMSIS = \

diff --git a/targets/STM32F103VET6_NB_GCC/GCC/Makefile b/targets/STM32F103VET6_NB_GCC/GCC/Makefile
@@ -74,7 +74,8 @@ CMSIS_SRC =  \
         C_SOURCES += $(CMSIS_SRC)
 
 ARCH_SRC =  \
-        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c}
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/src/*.c} \
+        ${wildcard $(TOP_DIR)/arch/arm/arm-m/cortex-m3/*.c}
         C_SOURCES += $(ARCH_SRC)
 HAL_DRIVER_SRC =  \
         $(TOP_DIR)/targets/STM32F103VET6_NB_GCC/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c  \
@@ -191,7 +192,8 @@ HAL_DRIVER_INC = \
 
 ARCH_INC = \
         -I $(TOP_DIR)/arch/arm/arm-m/include \
-	-I $(TOP_DIR)/arch/arm/common/cmsis
+	-I $(TOP_DIR)/arch/arm/common/cmsis \
+	-I $(TOP_DIR)/arch/arm/arm-m/cortex-m3
         C_INCLUDES += $(ARCH_INC)
 
 LITEOS_CMSIS = \