diff options
Diffstat (limited to 'cmsis.cmake')
| -rw-r--r-- | cmsis.cmake | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/cmsis.cmake b/cmsis.cmake index 9322240..b5b6726 100644 --- a/cmsis.cmake +++ b/cmsis.cmake @@ -43,43 +43,24 @@ target_include_directories(cmsis_core INTERFACE ${CMSIS_PATH}/CMSIS/Core/Include # CMSIS device add_library(cmsis_device INTERFACE) target_include_directories(cmsis_device INTERFACE ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Include) -if (TRUSTZONE_BUILD) - # Use Cortex-M Secure Extension when compiling - target_compile_options(cmsis_device INTERFACE -mcmse) - target_compile_definitions(cmsis_device INTERFACE TRUSTZONE_BUILD) - if (TRUSTZONE_SIDE STREQUAL secure) - target_compile_definitions(cmsis_device INTERFACE TRUSTZONE_SECURE) - else() - target_compile_definitions(cmsis_device INTERFACE TRUSTZONE_NONSECURE) - endif() -endif() + target_compile_options(cmsis_device INTERFACE -include${ARM_CPU}${ARM_FEATURES}.h) target_link_libraries(cmsis_device INTERFACE cmsis_core) # CMSIS startup -add_library(cmsis_startup STATIC) -if (TRUSTZONE_BUILD) - if (TRUSTZONE_SIDE STREQUAL secure) - target_sources(cmsis_startup PRIVATE - ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c - ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/system_${ARM_CPU}.c) - # Bring in the partion header - target_include_directories(cmsis_startup PRIVATE ${TRUSTZONE_PARTITION_DIRECTORY}) - elseif(TRUSTZONE_SIDE STREQUAL nonsecure) - target_sources(cmsis_startup PRIVATE - ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c) - endif() -else() - target_sources(cmsis_startup PRIVATE - ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c - ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/system_${ARM_CPU}.c) -endif() +add_library(cmsis_startup INTERFACE) +target_sources(cmsis_startup INTERFACE + ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c) -set_source_files_properties(${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c PROPERTIES COMPILE_FLAGS - -Wno-redundant-decls) +set_source_files_properties(${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/startup_${ARM_CPU}.c + PROPERTIES COMPILE_FLAGS -Wno-redundant-decls) -target_compile_definitions(cmsis_startup PRIVATE ${ARM_CPU}${ARM_FEATURES}) -target_link_libraries(cmsis_startup PRIVATE cmsis_device) +target_compile_definitions(cmsis_startup INTERFACE ${ARM_CPU}${ARM_FEATURES}) +target_link_libraries(cmsis_startup INTERFACE cmsis_device) -# Install libraries -install(TARGETS cmsis_startup LIBRARY DESTINATION "lib") +# CMSIS system +add_library(cmsis_system INTERFACE) +target_sources(cmsis_system INTERFACE + ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Source/system_${ARM_CPU}.c) +target_compile_definitions(cmsis_system INTERFACE ${ARM_CPU}${ARM_FEATURES}) +target_link_libraries(cmsis_system INTERFACE cmsis_startup) |