From d3f7abdb7c109517e6a71daed8bae63ad6436afc Mon Sep 17 00:00:00 2001
From: Michael Schwarcz <michael.schwarcz@arm.com>
Date: Thu, 3 Jan 2019 13:03:33 +0200
Subject: [PATCH 1/2] CMSIS/CORTEX-M: Don't build mbed_tz_context.c in TF-M
 targets

- TF-M v8m secure-side implements their own TZ context APIs so need to avoid building the Mbed implementation.
---
 cmsis/TARGET_CORTEX_M/mbed_tz_context.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmsis/TARGET_CORTEX_M/mbed_tz_context.c b/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
index 8e9541f75d..17bf625afe 100644
--- a/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
+++ b/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
@@ -22,6 +22,8 @@
  * limitations under the License.
  */
 
+#if !TARGET_TFM
+
 #if defined (__ARM_FEATURE_CMSE) &&  (__ARM_FEATURE_CMSE == 3U)
 
 #include "RTE_Components.h"
@@ -201,3 +203,5 @@ uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) {
   return 1U;    // Success
 }
 #endif
+
+#endif // !TARGET_TFM

From 1e8169df37128ae22a169c7108391ae530dca797 Mon Sep 17 00:00:00 2001
From: Michael Schwarcz <michael.schwarcz@arm.com>
Date: Thu, 10 Jan 2019 11:39:08 +0200
Subject: [PATCH 2/2] Update cmsis_importer.json SHAs

- Missing: CMSIS/RTX: Patch to conditionally compile (fb354752eb)
- New: CMSIS/CORTEX-M: Don't build mbed_tz_context.c in TF-M targets (d3f7abdb7c)
---
 tools/importer/cmsis_importer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/importer/cmsis_importer.json b/tools/importer/cmsis_importer.json
index 1882f0069a..34a8693b9f 100644
--- a/tools/importer/cmsis_importer.json
+++ b/tools/importer/cmsis_importer.json
@@ -149,7 +149,9 @@
       "b88254809eb626689c8aeb41304a308bf4e34a04",
       "287121ffdc4c9c19f9ce8872e4edd941862daca1",
       "1752803626865147dca92f30a39cef8d04581736",
-      "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9"
+      "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
+      "fb354752eb69403ad503c8e53da67da6483776d6",
+      "d3f7abdb7c109517e6a71daed8bae63ad6436afc"
     ]
 }