Align the TF-M version of the integration with kernel to version TF-Mv1.2.0 (#228)

Change-Id: I6d5f0732f4cb123df54b9df0b9820ef4dcf70fa4
Signed-off-by: Sherry Zhang <sherry.zhang2@arm.com>
diff --git a/portable/ThirdParty/GCC/ARM_CM33_TFM/README.md b/portable/ThirdParty/GCC/ARM_CM33_TFM/README.md
index 6b03f56..6b72362 100644
--- a/portable/ThirdParty/GCC/ARM_CM33_TFM/README.md
+++ b/portable/ThirdParty/GCC/ARM_CM33_TFM/README.md
@@ -15,7 +15,7 @@
 

 * ```os_wrapper_freertos.c```

   The implementation of APIs which are defined in ```os_wrapper\mutex.h``` by TF-M

-  (tag: TF-Mv1.1). The implementation is based on FreeRTOS mutex type semaphore.

+  (tag: TF-Mv1.2.0). The implementation is based on FreeRTOS mutex type semaphore.

 

 # Usage notes

 

@@ -27,7 +27,7 @@
 

 ### Get the TF-M source code

 

-See the [link](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/) to get the source code. This port is based on TF-M version **tag: TF-Mv1.1**.

+See the [link](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/) to get the source code. This port is based on TF-M version **tag: TF-Mv1.2.0**.

 

 ### Build TF-M

 

@@ -36,9 +36,9 @@
 

 ## Build the Non-Secure Side

 

-Please copy all the files in ```freertos_kernel\portable\GCC\ARM_CM33_NTZ``` into the ```freertos_kernel\portable\GCC\ARM_CM33_TFM``` folder before using this port. Note that TrustZone is enabled in this port. The TF-M runs in the Secure Side.

+Please copy all the files in ```freertos_kernel\portable\GCC\ARM_CM33_NTZ``` into the ```freertos_kernel\portable\ThirdParty\GCC\ARM_CM33_TFM``` folder before using this port. Note that TrustZone is enabled in this port. The TF-M runs in the Secure Side.

 

-Please call the API ```tfm_ns_interface_init()``` which is defined in ```os_wrapper_freertos.c``` at the very beginning of your application. Otherwise, it will always fail when calling a TF-M service in the Nonsecure Side.

+Please call the API ```tfm_ns_interface_init()``` which is defined in ```tfm_ns_interface.c``` at the very beginning of your application. Otherwise, it will always fail when calling a TF-M service in the Nonsecure Side.

 

 ### Configuration in FreeRTOS kernel

 

@@ -62,7 +62,7 @@
   as part of the Non-Secure source code.

 * files in ```trusted-firmware-m\build\install\export\tfm\include```

   These files are the necessary header files to call TF-M services.

-* ```trusted-firmware-m\build\install\export\tfm\veneers\s_veneers.o```

+* ```trusted-firmware-m\build\install\export\tfm\lib\s_veneers.o```

   This object file contains all the Non-Secure callable functions exported by

   TF-M and it should be linked when generating the Non-Secure image.