Skip to content

Commit e82669a

Browse files
urutvaurutva
committed
tf-m: Update tf-m to TF-Mv2.0.0 release
The `portable/ThirdParty/GCC/ARM_TFM/README.md` and `portable/ThirdParty/GCC/ARM_TFM/os_wrapper_freertos.c` are updated to support `TF-Mv2.0.0` of trusted-firmware-m release. Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>
1 parent c6487d9 commit e82669a

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎portable/ThirdParty/GCC/ARM_TFM/README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ platform.
77

88
The Platform Security Architecture (PSA) makes it quicker, easier and cheaper
99
to design security into a device from the ground up. PSA is made up of four key
10-
stages: analyze, architect, implement, and certify. See [PSA Resource Page](https://developer.arm.com/architectures/security-architectures/platform-security-architecture).
10+
stages: analyze, architect, implement, and certify. See [PSA Resource Page](https://www.arm.com/architecture/security-features/platform-security).
1111

1212
TF-M is an open source project. It provides a reference implementation of PSA
13-
for Arm M-profile architecture. Please get the details from this [link](https://www.trustedfirmware.org/about/).
13+
for Arm M-profile architecture. Please get the details from this [link](https://www.trustedfirmware.org/projects/tf-m/).
1414

1515
# Derivation of the source code
1616

17-
* ```os_wrapper_freertos.c```
18-
The implementation of APIs which are defined in ```\ns_interface\os_wrapper\mutex.h``` by tf-m-tests
19-
(tag: TF-Mv1.5.0 & TF-Mv1.6.0). The implementation is based on FreeRTOS mutex type semaphore.
17+
* `os_wrapper_freertos.c`
18+
The implementation of APIs which are defined in `/interface/include/os_wrapper/mutex.h`
19+
in trusted-firmware-m (tag: TF-Mv2.0.0). The implementation is based on
20+
FreeRTOS mutex type semaphore.
2021

2122
# Usage notes
2223

@@ -28,53 +29,52 @@ To build a project based on this port:
2829

2930
### Get the TF-M source code
3031

31-
See the [link](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/) to get the source code. This port is supported by TF-M version **tag: TF-Mv1.5.0** & **tag: TF-Mv1.6.0**.
32+
See the [link](https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/) to get the source code. This port is supported by TF-M version **tag: TF-Mv2.0.0**.
3233

3334
### Build TF-M
3435

35-
Please refer to this [link](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/tfm/building/tfm_build_instruction.html) to build the secure side.
36-
_**Note:** ```TFM_NS_MANAGE_NSID``` must be configured as "OFF" when building TF-M_.
36+
Please refer to this [link](https://trustedfirmware-m.readthedocs.io/en/latest/getting_started/) to build the secure side.
37+
_**Note:** `TFM_NS_MANAGE_NSID` must be configured as "OFF" when building TF-M_.
3738

3839
## Build the Non-Secure Side
3940

40-
Please copy all the files in ```freertos_kernel\portable\GCC\ARM_CM[23|33|55|85]_NTZ``` into the ```freertos_kernel\portable\ThirdParty\GCC\ARM_TFM``` folder before using this port. Note that TrustZone is enabled in this port. The TF-M runs in the Secure Side.
41+
Please copy all the files in `freertos_kernel/portable/GCC/ARM_CM[23|33|55|85]_NTZ` into the `freertos_kernel/portable/ThirdParty/GCC/ARM_TFM` folder before using this port. Note that TrustZone is enabled in this port. The TF-M runs in the Secure Side.
4142

42-
Please call the API ```tfm_ns_interface_init()``` which is defined in ```\app\tfm_ns_interface.c``` by tf-m-tests
43-
(tag: TF-Mv1.5.0 & TF-Mv1.6.0) at the very beginning of your application. Otherwise, it will always fail when calling a TF-M service in the Nonsecure Side.
43+
Please call the API `tfm_ns_interface_init()` which is defined in `/interface/src/os_wrapper/tfm_ns_interface_rtos.c` by trusted-firmware-m (tag: TF-Mv2.0.0) at the very beginning of your application. Otherwise, it will always fail when calling a TF-M service in the Nonsecure Side.
4444

4545
### Configuration in FreeRTOS kernel
4646

47-
* ```configRUN_FREERTOS_SECURE_ONLY```
47+
* `configRUN_FREERTOS_SECURE_ONLY`
4848
This macro should be configured as 0. In this port, TF-M runs in the Secure Side while FreeRTOS
4949
Kernel runs in the Non-Secure Side.
5050

51-
* ```configENABLE_FPU```
51+
* `configENABLE_FPU`
5252
The setting of this macro is decided by the setting in Secure Side which is platform-specific.
5353
If the Secure Side enables Non-Secure access to FPU, then this macro can be configured as 0 or 1. Otherwise, this macro can only be configured as 0.
5454
Please note that Cortex-M23 does not support FPU.
5555
Please refer to [TF-M documentation](https://tf-m-user-guide.trustedfirmware.org/integration_guide/tfm_fpu_support.html) for FPU usage on the Non-Secure side.
5656

57-
* ```configENABLE_MVE```
57+
* `configENABLE_MVE`
5858
The setting of this macro is decided by the setting in Secure Side which is platform-specific.
5959
If the Secure Side enables Non-Secure access to MVE, then this macro can be configured as 0 or 1. Otherwise, this macro can only be configured as 0.
6060
Please note that only Cortex-M55 and Cortex-M85 support MVE.
6161
Please refer to [TF-M documentation](https://tf-m-user-guide.trustedfirmware.org/integration_guide/tfm_fpu_support.html) for MVE usage on the Non-Secure side.
6262

63-
* ```configENABLE_TRUSTZONE```
63+
* `configENABLE_TRUSTZONE`
6464
This macro should be configured as 0 because TF-M doesn't use the secure context management function of FreeRTOS. New secure context management might be introduced when TF-M supports multiple secure context.
6565

6666

6767
### Integrate TF-M Non-Secure interface with FreeRTOS project
6868

6969
To enable calling TF-M services by the Non-Secure Side, the files below should be included in the FreeRTOS project and built together.
70-
* files in ```trusted-firmware-m\build\install\interface\src```
70+
* files in `trusted-firmware-m/build/api_ns/interface/src`
7171
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 as part of the Non-Secure source code.
72-
* files in ```trusted-firmware-m\build\install\interface\include```
72+
* files in `trusted-firmware-m/build/api_ns/interface/include`
7373
These files are the necessary header files to call TF-M services.
74-
* ```trusted-firmware-m\build\install\interface\lib\s_veneers.o```
74+
* `trusted-firmware-m/build/api_ns/interface/lib/s_veneers.o`
7575
This object file contains all the Non-Secure callable functions exported by
7676
TF-M and it should be linked when generating the Non-Secure image.
7777

7878

7979

80-
*Copyright (c) 2020-2022, Arm Limited. All rights reserved.*
80+
*Copyright (c) 2020-2024, Arm Limited. All rights reserved.*

‎portable/ThirdParty/GCC/ARM_TFM/os_wrapper_freertos.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
2+
* Copyright (c) 2019-2024, Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -24,8 +24,8 @@
2424

2525
/*
2626
* This file contains the implementation of APIs which are defined in
27-
* os_wrapper/mutex.h by TF-M(tag: TF-Mv1.1). The implementation is based
28-
* on FreeRTOS mutex type semaphore.
27+
* \interface/include/os_wrapper/mutex.h by TF-M(tag: TF-Mv2.0.0).
28+
* The implementation is based on FreeRTOS mutex type semaphore.
2929
*/
3030

3131
#include "os_wrapper/mutex.h"

0 commit comments

Comments
 (0)