Docs: Update required CMSIS_5 version to 5.5.0
This patch updates the documentation specifying that the
required version of CMSIS to be used is 5.5.0. It also
updates the define required during build time configuration
to DOMAIN_NS instead of __DOMAIN_NS.
Change-Id: Iebb157f981880c6fc89e60faf783499572757f4b
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4d9c953..4d1a0c8 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -126,7 +126,7 @@
config_setting_shared_compiler_flags(${PROJECT_OBJ_LIB})
#Set macro definitions
-set(TARGET_COMPILE_DEFINITIONS __thumb2__ __DOMAIN_NS=1 __ARM_FEATURE_CMSE=3)
+set(TARGET_COMPILE_DEFINITIONS __thumb2__ __DOMAIN_NS=1 DOMAIN_NS=__DOMAIN_NS __ARM_FEATURE_CMSE=3)
target_compile_definitions(${PROJECT_OBJ_LIB} PRIVATE ${TARGET_COMPILE_DEFINITIONS})
#Set include directories.
diff --git a/docs/user_guides/tfm_build_instruction.rst b/docs/user_guides/tfm_build_instruction.rst
index b817353..f350251 100644
--- a/docs/user_guides/tfm_build_instruction.rst
+++ b/docs/user_guides/tfm_build_instruction.rst
@@ -60,7 +60,7 @@
*******************
External dependency
*******************
-- CMSIS_5 is used to import RTX for the example non-secure app
+- `CMSIS_5` is used to import RTX for the example non-secure app
- Mbed TLS and Mbed Crypto are used as crypto libraries on the secure side
****************
@@ -82,7 +82,12 @@
git clone https://git.trustedfirmware.org/trusted-firmware-m.git
git clone https://github.com/ARMmbed/mbedtls.git -b mbedtls-2.7.9
git clone https://github.com/ARMmbed/mbed-crypto.git -b mbedcrypto-1.0.0
- git clone https://github.com/ARM-software/CMSIS_5.git -b 5.2.0
+ git clone https://github.com/ARM-software/CMSIS_5.git -b 5.5.0
+
+.. Note::
+ `CMSIS_5` now uses `git-lfs` for storing large size binaries so the cloning
+ process has changed from previous releases. Please refer to the `CMSIS_5`
+ documentation for more details.
Build steps for the AN521 target platform:
==========================================
diff --git a/secure_fw/CMakeLists.txt b/secure_fw/CMakeLists.txt
index 268355d..d605b06 100644
--- a/secure_fw/CMakeLists.txt
+++ b/secure_fw/CMakeLists.txt
@@ -166,7 +166,8 @@
endif()
#Set macro definitions for the project.
- embedded_set_target_compile_defines(TARGET ${PROJECT_OBJ_LIB} LANGUAGE C DEFINES __thumb2__ __ARM_FEATURE_CMSE=3 TFM_LVL=${TFM_LVL} ${DEBUG_AUTHENTICATION} APPEND)
+ set(TARGET_COMPILE_DEFINITIONS __thumb2__ __DOMAIN_NS=0 DOMAIN_NS=__DOMAIN_NS __ARM_FEATURE_CMSE=3 TFM_LVL=${TFM_LVL} ${DEBUG_AUTHENTICATION})
+ embedded_set_target_compile_defines(TARGET ${PROJECT_OBJ_LIB} LANGUAGE C DEFINES ${TARGET_COMPILE_DEFINITIONS} APPEND)
if (REGRESSION OR CORE_TEST)
if (DEFINED TFM_PARTITION_TEST_SECURE_SERVICES AND TFM_PARTITION_TEST_SECURE_SERVICES)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 945e925..4a7efef 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -98,8 +98,9 @@
config_setting_shared_compiler_flags(tfm_non_secure_tests)
config_setting_shared_linker_flags(tfm_non_secure_tests)
-embedded_set_target_compile_defines(TARGET tfm_non_secure_tests LANGUAGE C DEFINES __thumb2__ __ARM_FEATURE_CMSE=3 __DOMAIN_NS=1 TFM_LVL=${TFM_LVL} APPEND)
-#__DOMAIN_NS=1
+#Set macro definitions
+set(TARGET_COMPILE_DEFINITIONS __thumb2__ __DOMAIN_NS=1 DOMAIN_NS=__DOMAIN_NS __ARM_FEATURE_CMSE=3 TFM_LVL=${TFM_LVL})
+embedded_set_target_compile_defines(TARGET tfm_non_secure_tests LANGUAGE C DEFINES ${TARGET_COMPILE_DEFINITIONS} APPEND)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Default install location for tfm_storage." FORCE)