diff options
author | Ledion Daja <ledion.daja@arm.com> | 2022-09-21 16:23:49 +0200 |
---|---|---|
committer | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2022-09-30 10:44:41 +0000 |
commit | 5845f3d42db32f42e83f22073a88d583ff325953 (patch) | |
tree | 192dc8b9c3db4b2ed964e6f8a4fa169dd784f08d /rtos/freertos_config/CMakeLists.txt | |
parent | 45a8a133da680f739f079e6c23eb0596802c9708 (diff) | |
download | ethos-u-core-software-5845f3d42db32f42e83f22073a88d583ff325953.tar.gz |
Fix cmake CMAKE_SYSTEM_PROCESSOR string matches
To avoid unwanted matches of regexps, example: "cortex-m3" matches
string "cortex-m33", several string MATCHES have been reworked.
Change-Id: Ib923fbed9edbfba7de0af005c67b5527acdf40f9
Diffstat (limited to 'rtos/freertos_config/CMakeLists.txt')
-rw-r--r-- | rtos/freertos_config/CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/rtos/freertos_config/CMakeLists.txt b/rtos/freertos_config/CMakeLists.txt index 554a492..86958c5 100644 --- a/rtos/freertos_config/CMakeLists.txt +++ b/rtos/freertos_config/CMakeLists.txt @@ -16,23 +16,23 @@ # limitations under the License. # -if(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m3") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m3(\\+|$)") add_compile_definitions(CPU_CORTEX_M3) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m33") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m33(\\+|$)") add_compile_definitions(CPU_CORTEX_M33) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m4") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m4(\\+|$)") add_compile_definitions(CPU_CORTEX_M4) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55(\\+|$)") add_compile_definitions(CPU_CORTEX_M55) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m7") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m7(\\+|$)") add_compile_definitions(CPU_CORTEX_M7) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m85") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m85(\\+|$)") add_compile_definitions(CPU_CORTEX_M85) else() message(FATAL_ERROR "Unsupported compiler ${CMAKE_SYSTEM_PROCESSOR}.") endif() -if((${TARGET} STREQUAL "mps2") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m55")) +if((${TARGET} STREQUAL "mps2") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m55(\\+|$)")) set("SYSTEM_CORE_CLOCK" "25000000") else() set("SYSTEM_CORE_CLOCK" "32000000") @@ -66,28 +66,28 @@ target_sources(freertos_kernel PRIVATE target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/MemMang/heap_3.c) -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m3") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m3(\\+|$)") target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM3/port.c ) target_include_directories(freertos_kernel PUBLIC ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM3 ) -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m4") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m4(\\+|$)") target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM4F/port.c ) target_include_directories(freertos_kernel PUBLIC ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM4F ) -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m7") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m7(\\+|$)") target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM7/r0p1/port.c ) target_include_directories(freertos_kernel PUBLIC ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM7/r0p1 ) -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m33") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m33(\\+|$)") target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c @@ -95,7 +95,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m33") target_include_directories(freertos_kernel PUBLIC ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure ) -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m55") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55(\\+|$)") # TODO: using the same port files as Cortex-M33. Update for Cortex-M55. target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c @@ -104,7 +104,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m55") target_include_directories(freertos_kernel PUBLIC ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure ) -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "cortex-m85") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m85(\\+|$)") # TODO: using the same port files as Cortex-M33. Update for Cortex-M85. target_sources(freertos_kernel PRIVATE ${FREERTOS_KERNEL_PATH}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c |