diff options
-rw-r--r-- | app/CMakeLists.txt | 16 | ||||
-rw-r--r-- | platform/ext/Mps2AN519.cmake | 18 | ||||
-rw-r--r-- | platform/ext/Mps2AN521.cmake | 18 | ||||
-rw-r--r-- | platform/ext/Mps2AN539.cmake | 18 | ||||
-rw-r--r-- | platform/ext/Mps3AN524.cmake | 18 | ||||
-rw-r--r-- | platform/ext/SSE-200_AWS.cmake | 18 | ||||
-rw-r--r-- | platform/ext/fvp_sse300_mps2.cmake | 6 | ||||
-rw-r--r-- | platform/ext/lpc55s69.cmake | 12 | ||||
-rw-r--r-- | platform/ext/musca_a.cmake | 18 | ||||
-rw-r--r-- | platform/ext/musca_b1.cmake | 12 | ||||
-rw-r--r-- | platform/ext/musca_s1.cmake | 12 | ||||
-rw-r--r-- | platform/ext/psoc64.cmake | 18 | ||||
-rw-r--r-- | platform/ext/target/stm/stm32l5xx/nucleo_l552ze_q.cmake | 8 | ||||
-rw-r--r-- | platform/ext/target/stm/stm32l5xx/stm32l562e_dk.cmake | 8 |
14 files changed, 100 insertions, 100 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index b2bd166a81..99d171c7c7 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -30,10 +30,10 @@ set(MCUBOOT_DIR "${TFM_ROOT_DIR}/bl2/ext/mcuboot") include("${MCUBOOT_DIR}/MCUBoot.cmake") #Set variables -get_filename_component(CMSIS_5_DIR ${TFM_ROOT_DIR}/../CMSIS_5 ABSOLUTE) +get_filename_component(CMSIS_DIR ${TFM_ROOT_DIR}/../CMSIS_5/CMSIS ABSOLUTE) -if(NOT EXISTS ${CMSIS_5_DIR}) - message(FATAL_ERROR "Missing CMSIS_5. Please clone the CMSIS_5 repo to directory \"${CMSIS_5_DIR}\".") +if(NOT EXISTS ${CMSIS_DIR}) + message(FATAL_ERROR "Missing CMSIS_5. Please clone the CMSIS_5 repo to directory \"${CMSIS_DIR}\".") endif() if (NOT DEFINED BL2) @@ -70,8 +70,8 @@ endif() embedded_include_directories(PATH ${TFM_ROOT_DIR}/app ABSOLUTE) -set(NS_APP_SRC "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Config/RTX_Config.c" - "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Source/rtx_lib.c" +set(NS_APP_SRC "${CMSIS_DIR}/RTOS2/RTX/Config/RTX_Config.c" + "${CMSIS_DIR}/RTOS2/RTX/Source/rtx_lib.c" "${APP_DIR}/main_ns.c" "${APP_DIR}/tfm_integ_test.c" "${APP_DIR}/os_wrapper_cmsis_rtos_v2.c" @@ -207,9 +207,9 @@ embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${INTERFACE_D embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${TFM_ROOT_DIR} ABSOLUTE APPEND) embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${TFM_ROOT_DIR}/secure_fw/spm ABSOLUTE APPEND) embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE APPEND) -embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Include ABSOLUTE APPEND) -embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_5_DIR}/CMSIS/RTOS2/Include ABSOLUTE APPEND) -embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Config ABSOLUTE APPEND) +embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_DIR}/RTOS2/RTX/Include ABSOLUTE APPEND) +embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_DIR}/RTOS2/Include ABSOLUTE APPEND) +embedded_target_include_directories(TARGET ${PROJECT_OBJ_LIB} PATH ${CMSIS_DIR}/RTOS2/RTX/Config ABSOLUTE APPEND) if (NOT DEFINED TFM_NS_CLIENT_IDENTIFICATION) message(FATAL_ERROR "Incomplete build configuration: TFM_NS_CLIENT_IDENTIFICATION is undefined.") diff --git a/platform/ext/Mps2AN519.cmake b/platform/ext/Mps2AN519.cmake index 1e61d3aa21..c18f4826f3 100644 --- a/platform/ext/Mps2AN519.cmake +++ b/platform/ext/Mps2AN519.cmake @@ -17,25 +17,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/armclang/mps2_an519_bl2.sct") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/armclang/mps2_an519_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MBN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MBN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/gcc/mps2_an519_bl2.ld") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/gcc/mps2_an519_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MBN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MBN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/iar/mps2_an519_bl2.icf") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an519/iar/mps2_an519_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/Mps2AN521.cmake b/platform/ext/Mps2AN521.cmake index fa72061f3b..6a6d64d803 100644 --- a/platform/ext/Mps2AN521.cmake +++ b/platform/ext/Mps2AN521.cmake @@ -18,25 +18,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/armclang/mps2_an521_bl2.sct") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/armclang/mps2_an521_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/gcc/mps2_an521_bl2.ld") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/gcc/mps2_an521_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/iar/mps2_an521_bl2.icf") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/mps2/an521/iar/mps2_an521_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/Mps2AN539.cmake b/platform/ext/Mps2AN539.cmake index eb4cb4f109..a806e50266 100644 --- a/platform/ext/Mps2AN539.cmake +++ b/platform/ext/Mps2AN539.cmake @@ -19,25 +19,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (BL2_SCATTER_FILE_NAME "${AN539_DIR}/device/source/armclang/an539_mps2_bl2.sct") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (NS_SCATTER_FILE_NAME "${AN539_DIR}/device/source/armclang/an539_mps2_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MBN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MBN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (BL2_SCATTER_FILE_NAME "${AN539_DIR}/device/source/gcc/an539_mps2_bl2.ld") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (NS_SCATTER_FILE_NAME "${AN539_DIR}/device/source/gcc/an539_mps2_ns.ld") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MBN.a") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MBN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (BL2_SCATTER_FILE_NAME "${AN539_DIR}/device/source/iar/an539_mps2_bl2.icf") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (NS_SCATTER_FILE_NAME "${AN539_DIR}/device/source/iar/an539_mps2_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/Mps3AN524.cmake b/platform/ext/Mps3AN524.cmake index 1e5fad9716..6ab58f4d14 100644 --- a/platform/ext/Mps3AN524.cmake +++ b/platform/ext/Mps3AN524.cmake @@ -25,25 +25,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (BL2_SCATTER_FILE_NAME "${AN524_DIR}/device/source/armclang/mps3_an524_bl2.sct") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (NS_SCATTER_FILE_NAME "${AN524_DIR}/device/source/armclang/mps3_an524_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (BL2_SCATTER_FILE_NAME "${AN524_DIR}/device/source/gcc/mps3_an524_bl2.ld") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (NS_SCATTER_FILE_NAME "${AN524_DIR}/device/source/gcc/mps3_an524_ns.ld") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (BL2_SCATTER_FILE_NAME "${AN524_DIR}/device/source/iar/mps3_an524_bl2.icf") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (NS_SCATTER_FILE_NAME "${AN524_DIR}/device/source/iar/mps3_an524_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/SSE-200_AWS.cmake b/platform/ext/SSE-200_AWS.cmake index 0c55730d9b..4c9500f005 100644 --- a/platform/ext/SSE-200_AWS.cmake +++ b/platform/ext/SSE-200_AWS.cmake @@ -18,25 +18,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/armclang/sse-200_aws_bl2.sct") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/armclang/sse-200_aws_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/gcc/sse-200_aws_bl2.ld") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/gcc/sse-200_aws_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/iar/sse-200_aws_bl2.icf") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/sse-200_aws/iar/sse-200_aws_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MBN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/fvp_sse300_mps2.cmake b/platform/ext/fvp_sse300_mps2.cmake index 907f946093..83d87ff09d 100644 --- a/platform/ext/fvp_sse300_mps2.cmake +++ b/platform/ext/fvp_sse300_mps2.cmake @@ -20,9 +20,9 @@ if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (BL2_SCATTER_FILE_NAME "${FVP_SSE300_DIR}/device/source/armclang/fvp_sse300_mps2_bl2.sct") set (NS_SCATTER_FILE_NAME "${FVP_SSE300_DIR}/device/source/armclang/fvp_sse300_mps2_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") message(FATAL_ERROR "No GNUARM support yet for target '${TARGET_PLATFORM}'.") diff --git a/platform/ext/lpc55s69.cmake b/platform/ext/lpc55s69.cmake index 1025d6f9d1..66f72f4d44 100644 --- a/platform/ext/lpc55s69.cmake +++ b/platform/ext/lpc55s69.cmake @@ -32,16 +32,16 @@ if(COMPILER STREQUAL "ARMCLANG") #set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}target/nxp/lpcxpresso55s69/Device/Source/armclang/LPC55S69_cm33_core0_bl2.sct") #set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}target/nxp/lpcxpresso55s69/Device/Source/armclang/LPC55S69_cm33_core0_s.sct") #set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}target/nxp/lpcxpresso55s69/Device/Source/armclang/LPC55S69_cm33_core0_ns.sct") - if (DEFINED CMSIS_5_DIR) - # Not all projects defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # Not all projects defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/nxp/lpcxpresso55s69/Device/Source/armgcc/LPC55S69_cm33_core0_ns.ld") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/musca_a.cmake b/platform/ext/musca_a.cmake index 323b94070e..3af796fee1 100644 --- a/platform/ext/musca_a.cmake +++ b/platform/ext/musca_a.cmake @@ -17,25 +17,25 @@ if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/armclang/musca_bl2.sct") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/armclang/musca_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/gcc/musca_bl2.ld") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/gcc/musca_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() elseif(COMPILER STREQUAL "IARARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/iar/musca_bl2.icf") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_a/Device/Source/iar/musca_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/musca_b1.cmake b/platform/ext/musca_b1.cmake index 75ff37a201..2b825666bc 100644 --- a/platform/ext/musca_b1.cmake +++ b/platform/ext/musca_b1.cmake @@ -17,17 +17,17 @@ if (COMPILER STREQUAL "ARMCLANG") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_b1/Device/Source/armclang/musca_bl2.sct") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_b1/Device/Source/armclang/musca_ns.sct") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif (COMPILER STREQUAL "GNUARM") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_b1/Device/Source/gcc/musca_bl2.ld") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_b1/Device/Source/gcc/musca_ns.ld") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/musca_s1.cmake b/platform/ext/musca_s1.cmake index 707d531934..8d28a9a094 100644 --- a/platform/ext/musca_s1.cmake +++ b/platform/ext/musca_s1.cmake @@ -17,17 +17,17 @@ if (COMPILER STREQUAL "ARMCLANG") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_s1/Device/Source/armclang/musca_bl2.sct") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_s1/Device/Source/armclang/musca_ns.sct") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_V8MMN.lib") endif() elseif (COMPILER STREQUAL "GNUARM") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_s1/Device/Source/gcc/musca_bl2.ld") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/musca_s1/Device/Source/gcc/musca_ns.ld") - if (DEFINED CMSIS_5_DIR) - # Not all projects define CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # Not all projects define CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/psoc64.cmake b/platform/ext/psoc64.cmake index bcf78245d0..f59142333e 100644 --- a/platform/ext/psoc64.cmake +++ b/platform/ext/psoc64.cmake @@ -47,25 +47,25 @@ set(PLATFORM_DIR ${CMAKE_CURRENT_LIST_DIR}) if(COMPILER STREQUAL "ARMCLANG") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/armclang/tfm_common_s.sct") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/cypress/psoc64/Device/Source/armclang/psoc6_ns.sct") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/ARM/RTX_CM4F.lib") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/ARM/RTX_CM4F.lib") endif() elseif(COMPILER STREQUAL "GNUARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/cypress/psoc64/Device/Source/gcc/psoc6_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. # [libRTX_CM3.a should be used for CM4 without FPU] - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM3.a") + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_CM3.a") endif() elseif(COMPILER STREQUAL "IARARM") set (S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/iar/tfm_common_s.icf") set (NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. # [RTX_CM3.a should be used for CM4 without FPU] - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/IAR/RTX_CM3.a") + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/IAR/RTX_CM3.a") endif() else() message(FATAL_ERROR "No startup file is available for compiler '${CMAKE_C_COMPILER_ID}'.") diff --git a/platform/ext/target/stm/stm32l5xx/nucleo_l552ze_q.cmake b/platform/ext/target/stm/stm32l5xx/nucleo_l552ze_q.cmake index 6cd9130c26..b828cd6ff4 100644 --- a/platform/ext/target/stm/stm32l5xx/nucleo_l552ze_q.cmake +++ b/platform/ext/target/stm/stm32l5xx/nucleo_l552ze_q.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2018, Arm Limited. All rights reserved. +# Copyright (c) 2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -27,9 +27,9 @@ if(COMPILER STREQUAL "GNUARM") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/stm/stm32l5xx/Device/Source/gcc/stm32l5xx_bl2.ld") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/stm/stm32l5xx/Device/Source/gcc/stm32l5xx_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set (RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set (RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() else() message(FATAL_ERROR "'${COMPILER}' is not supported.") diff --git a/platform/ext/target/stm/stm32l5xx/stm32l562e_dk.cmake b/platform/ext/target/stm/stm32l5xx/stm32l562e_dk.cmake index 4b1595683d..abfd91b217 100644 --- a/platform/ext/target/stm/stm32l5xx/stm32l562e_dk.cmake +++ b/platform/ext/target/stm/stm32l5xx/stm32l562e_dk.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2018, Arm Limited. All rights reserved. +# Copyright (c) 2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -27,9 +27,9 @@ if(COMPILER STREQUAL "GNUARM") set(BL2_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/stm/stm32l5xx/Device/Source/gcc/stm32l5xx_bl2.ld") set(S_SCATTER_FILE_NAME "${PLATFORM_DIR}/common/gcc/tfm_common_s.ld") set(NS_SCATTER_FILE_NAME "${PLATFORM_DIR}/target/stm/stm32l5xx/Device/Source/gcc/stm32l5xx_ns.ld") - if (DEFINED CMSIS_5_DIR) - # not all project defines CMSIS_5_DIR, only the ones that use it. - set(RTX_LIB_PATH "${CMSIS_5_DIR}/CMSIS/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") + if (DEFINED CMSIS_DIR) + # not all project defines CMSIS_DIR, only the ones that use it. + set(RTX_LIB_PATH "${CMSIS_DIR}/RTOS2/RTX/Library/GCC/libRTX_V8MMN.a") endif() else() message(FATAL_ERROR "'${COMPILER}' is not supported.") |