Skip to content

Commit c290780

Browse files
authored
Update the README to align with TF-Mv1.4.0 in TF-M integration (#384)
Change-Id: I41fc8e18657086e86eacd38ed70f474555739a3c Signed-off-by: Sherry Zhang <sherry.zhang2@arm.com>
1 parent 0b1e9d7 commit c290780

File tree

1 file changed

+11
-10
lines changed
  • portable/ThirdParty/GCC/ARM_CM33_TFM

1 file changed

+11
-10
lines changed

portable/ThirdParty/GCC/ARM_CM33_TFM/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ for Arm M-profile architecture. Please get the details from this [link](https://
1414
# Derivation of the source code
1515

1616
* ```os_wrapper_freertos.c```
17-
The implementation of APIs which are defined in ```os_wrapper\mutex.h``` by TF-M
18-
(tag: TF-Mv1.2.0). The implementation is based on FreeRTOS mutex type semaphore.
17+
The implementation of APIs which are defined in ```\os_wrapper\mutex.h``` by tf-m-tests
18+
(tag: TF-Mv1.4.0). The implementation is based on FreeRTOS mutex type semaphore.
1919

2020
# Usage notes
2121

@@ -27,18 +27,19 @@ To build a project based on this port:
2727

2828
### Get the TF-M source code
2929

30-
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**.
30+
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.4.0**.
3131

3232
### Build TF-M
3333

34-
Please refer to this [link](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/docs/getting_started/tfm_build_instruction.rst) to build the secure side.
35-
_**Note:** ```CONFIG_TFM_ENABLE_CTX_MGMT``` must be configured as "OFF" when building TF-M_.
34+
Please refer to this [link](https://tf-m-user-guide.trustedfirmware.org/docs/technical_references/instructions/tfm_build_instruction.html) to build the secure side.
35+
_**Note:** ```TFM_NS_CLIENT_IDENTIFICATION``` must be configured as "OFF" when building TF-M_.
3636

3737
## Build the Non-Secure Side
3838

3939
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.
4040

41-
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.
41+
Please call the API ```tfm_ns_interface_init()``` which is defined in ```tfm_ns_interface.c``` by tf-m-tests
42+
(tag: TF-Mv1.4.0)at the very beginning of your application. Otherwise, it will always fail when calling a TF-M service in the Nonsecure Side.
4243

4344
### Configuration in FreeRTOS kernel
4445

@@ -57,15 +58,15 @@ This macro should be configured as 0 because TF-M doesn't use the secure context
5758
### Integrate TF-M Non-Secure interface with FreeRTOS project
5859

5960
To enable calling TF-M services by the Non-Secure Side, the files below should be included in the FreeRTOS project and built together.
60-
* files in ```trusted-firmware-m\build\install\export\tfm\src```
61+
* files in ```trusted-firmware-m\build\install\interface\src```
6162
These files contain the implementation of PSA Functional Developer APIs which can be called by Non-Secure Side directly and PSA Firmware Framework APIs in the IPC model. These files should be taken
6263
as part of the Non-Secure source code.
63-
* files in ```trusted-firmware-m\build\install\export\tfm\include```
64+
* files in ```trusted-firmware-m\build\install\interface\include```
6465
These files are the necessary header files to call TF-M services.
65-
* ```trusted-firmware-m\build\install\export\tfm\lib\s_veneers.o```
66+
* ```trusted-firmware-m\build\install\interface\lib\s_veneers.o```
6667
This object file contains all the Non-Secure callable functions exported by
6768
TF-M and it should be linked when generating the Non-Secure image.
6869

6970

7071

71-
*Copyright (c) 2020, Arm Limited. All rights reserved.*
72+
*Copyright (c) 2020-2021, Arm Limited. All rights reserved.*

0 commit comments

Comments
 (0)