CMake: Move mpu_wrapper to ports library. (FreeRTOS#459)

xinhaisc · Feb 22, 2022 · 38efd26 · 38efd26
1 parent 09a2c0b
commit 38efd26
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,7 +180,6 @@ add_library(freertos_kernel STATIC
     stream_buffer.c
     tasks.c
     timers.c
-    portable/Common/mpu_wrappers.c
 
     # If FREERTOS_HEAP is digit between 1 .. 5 - it is heap number, otherwise - it is path to custom heap source file
     $<IF:$<BOOL:$<FILTER:${FREERTOS_HEAP},EXCLUDE,^[1-5]$>>,${FREERTOS_HEAP},portable/MemMang/heap_${FREERTOS_HEAP}.c>

diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt
@@ -393,6 +393,23 @@ add_library(freertos_kernel_port STATIC
         WizC/PIC18/Drivers/Tick/Tick.c>
 )
 
+if(
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM23_NTZ_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM23_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM33_NTZ_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM3_MPU" OR
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM4_MPU" OR
+    FREERTOS_PORT STREQUAL "GCC_ARM_CM33_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "IAR_ARM_CM23_NTZ_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "IAR_ARM_CM23_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "IAR_ARM_CM33_NTZ_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "IAR_ARM_CM4F_MPU" OR
+    FREERTOS_PORT STREQUAL "IAR_ARM_CM33_NONSECURE" OR
+    FREERTOS_PORT STREQUAL "RVDS_ARM_CM4_MPU"
+)
+    target_sources(freertos_kernel_port PRIVATE Common/mpu_wrappers.c)
+endif()
+
 target_include_directories(freertos_kernel_port PUBLIC
     $<$<STREQUAL:${FREERTOS_PORT},BCC_16BIT_DOS_FLSH186>:
         ${CMAKE_CURRENT_LIST_DIR}/BCC/16BitDOS/common