aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Peng <kevin.peng@arm.com>2020-05-21 16:46:53 +0800
committerKevin Peng <kevin.peng@arm.com>2020-06-24 10:40:22 +0800
commitb10e07119bc0a883fe714953a35c5352b272cadb (patch)
treeaee114417d44231b599bbfc75d21c637e7cd917f
parent2131fdb1b7e450a87b86926d22fa8d6b962617ac (diff)
downloadtrusted-firmware-m-b10e07119bc0a883fe714953a35c5352b272cadb.tar.gz
Build: Use CMSIS for testing from tf-m-tests
TF-M testing is using CMSIS RTX as NS OS. It links to the pre-built RTX libraries from the CMSIS_5 repo. Because the CMSIS_5 repo will remove the libraries, a copy of necessary RTX libraries along with source codes is stored in the tf-m-tests repo. This patch is to move the CMSIS RTX reference from CMSIS_5 to tf-m-tests. Change-Id: I19e9ac333b200e69a749607fd1a2374805861be8 Signed-off-by: Kevin Peng <kevin.peng@arm.com>
-rw-r--r--app/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 99d171c7c..5de1fbf48 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -29,11 +29,11 @@ embedded_project_fixup()
set(MCUBOOT_DIR "${TFM_ROOT_DIR}/bl2/ext/mcuboot")
include("${MCUBOOT_DIR}/MCUBoot.cmake")
-#Set variables
-get_filename_component(CMSIS_DIR ${TFM_ROOT_DIR}/../CMSIS_5/CMSIS ABSOLUTE)
+#CMSIS
+get_filename_component(CMSIS_DIR ${TFM_ROOT_DIR}/../tf-m-tests/CMSIS ABSOLUTE)
if(NOT EXISTS ${CMSIS_DIR})
- message(FATAL_ERROR "Missing CMSIS_5. Please clone the CMSIS_5 repo to directory \"${CMSIS_DIR}\".")
+ message(FATAL_ERROR "Missing CMSIS. Please clone the tf-m-tests repo.")
endif()
if (NOT DEFINED BL2)