CMSIS/RTX: Patch to conditionally compile

Deepika · deepikabhavnani · commit d0a43b8af0ee · 2018-04-11T11:41:26.000-05:00
tz_context.c should be compiled only for secure world,
definition of API's in tz_context.h should be part of secure
binary/bootloader when building mbed-os as non-secure
diff --git a/cmsis/TARGET_CORTEX_M/mbed_tz_context.c b/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
@@ -25,6 +25,8 @@
  *
  *---------------------------------------------------------------------------*/
  
+#if defined (__ARM_FEATURE_CMSE) &&  (__ARM_FEATURE_CMSE == 3U)
+
 #include "RTE_Components.h"
 #include CMSIS_device_header
 #include "tz_context.h"
@@ -201,3 +203,4 @@ uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) {
 
   return 1U;    // Success
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`---------------------------------------------------------------------------/`
`27`	`27`
	`28`	`+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)`
	`29`	`+`
`28`	`30`	`#include "RTE_Components.h"`
`29`	`31`	`#include CMSIS_device_header`
`30`	`32`	`#include "tz_context.h"`
`@@ -201,3 +203,4 @@ uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) {`
`201`	`203`
`202`	`204`	`return 1U; // Success`
`203`	`205`	`}`
	`206`	`+#endif`