ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9324 from kfnta/avoid_mbed_tz_context 

Avoid building mbed_tz_context.c for TF-M targets
pull/9369/head
Martin Kojtal 2019-01-14 08:56:25 +00:00 committed by GitHub
parent 116e42f840 1e8169df37
commit c5014f4e19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmsis/TARGET_CORTEX_M/mbed_tz_context.c
View File

@ -22,6 +22,8 @@
* limitations under the License. * limitations under the License.
*/ */
#if !TARGET_TFM
#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
#include "RTE_Components.h" #include "RTE_Components.h"
@ -201,3 +203,5 @@ uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) {
return 1U; // Success return 1U; // Success
} }
#endif #endif
#endif // !TARGET_TFM

4
tools/importer/cmsis_importer.json
View File

@ -150,7 +150,9 @@
"287121ffdc4c9c19f9ce8872e4edd941862daca1", "287121ffdc4c9c19f9ce8872e4edd941862daca1",
"b228cd9db0b7ed79d99f1d9be15d512791f367cc", "b228cd9db0b7ed79d99f1d9be15d512791f367cc",
"1752803626865147dca92f30a39cef8d04581736", "1752803626865147dca92f30a39cef8d04581736",
"6a6e3ac0ebab1a6b6aa08d0928702c79562acee9" "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
"fb354752eb69403ad503c8e53da67da6483776d6",
"d3f7abdb7c109517e6a71daed8bae63ad6436afc"
] ]
} }