Skip to content

Commit 624e0e2

Browse files
committed
Follow review suggestion to update code changes
1 parent 9478a65 commit 624e0e2

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

examples/template_configuration/FreeRTOSConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,10 @@
602602

603603
/* Set configENABLE_MVE to 1 to enable the M-Profile Vector Extension (MVE)
604604
* support, or 0 to leave the MVE support disabled. This option is only
605-
* applicable to Cortex-M55 and Cortex-M85 ports as M-Profile Vector Extension
606-
* (MVE) is available only on these architectures. configENABLE_MVE must be left
607-
* undefined, or defined to 0 for the Cortex-M23,Cortex-M33 and Cortex-M35P
608-
* ports. */
605+
* applicable to Cortex-M52, Cortex-M55 and Cortex-M85 ports as M-Profile
606+
* Vector Extension (MVE) is available only on these architectures.
607+
* configENABLE_MVE must be left undefined, or defined to 0 for the
608+
* Cortex-M23,Cortex-M33 and Cortex-M35P ports. */
609609
#define configENABLE_MVE 1
610610

611611
/******************************************************************************/

portable/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,18 @@ add_library(freertos_kernel_port OBJECT
186186
GCC/ARM_CM52/non_secure/port.c
187187
GCC/ARM_CM52/non_secure/portasm.c
188188
GCC/ARM_CM52/non_secure/mpu_wrappers_v2_asm.c>
189+
189190
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_SECURE>:
190191
GCC/ARM_CM52/secure/secure_context_port.c
191192
GCC/ARM_CM52/secure/secure_context.c
192193
GCC/ARM_CM52/secure/secure_heap.c
193194
GCC/ARM_CM52/secure/secure_init.c>
195+
194196
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_NTZ_NONSECURE>:
195197
GCC/ARM_CM52_NTZ/non_secure/port.c
196198
GCC/ARM_CM52_NTZ/non_secure/portasm.c
197199
GCC/ARM_CM52_NTZ/non_secure/mpu_wrappers_v2_asm.c>
200+
198201
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_TFM>:
199202
GCC/ARM_CM52_NTZ/non_secure/port.c
200203
GCC/ARM_CM52_NTZ/non_secure/portasm.c
@@ -1004,6 +1007,7 @@ target_include_directories(freertos_kernel_port_headers INTERFACE
10041007
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_SECURE>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM52/secure>
10051008
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_NTZ_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM52_NTZ/non_secure>
10061009
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM52_TFM>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM52_NTZ/non_secure>
1010+
10071011
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM85/non_secure>
10081012
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_SECURE>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM85/secure>
10091013
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_NTZ_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CM85_NTZ/non_secure>
@@ -1143,6 +1147,7 @@ target_include_directories(freertos_kernel_port_headers INTERFACE
11431147
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM52_SECURE>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM52/secure>
11441148
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM52_NTZ_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM52_NTZ/non_secure>
11451149
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM52_TFM>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM52_NTZ/non_secure>
1150+
11461151
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM85/non_secure>
11471152
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_SECURE>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM85/secure>
11481153
$<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_NTZ_NONSECURE>:${CMAKE_CURRENT_LIST_DIR}/IAR/ARM_CM85_NTZ/non_secure>

portable/ThirdParty/GCC/ARM_TFM/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
This port adds the support that FreeRTOS applications can call the secure
44
services in Trusted Firmware M(TF-M) through Platform Security Architecture
5-
(PSA) API based on the ARM Cortex-M23, Cortex-M33, Cortex-M55 and Cortex-M85
6-
platform.
5+
(PSA) API based on the ARM Cortex-M23, Cortex-M33, Cortex-M52, Cortex-M55
6+
and Cortex-M85 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
@@ -38,7 +38,7 @@ _**Note:** `TFM_NS_MANAGE_NSID` must be configured as "OFF" when building TF-M_.
3838

3939
## Build the Non-Secure Side
4040

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.
41+
Please copy all the files in `freertos_kernel/portable/GCC/ARM_CM[23|33|52|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.
4242

4343
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

@@ -57,7 +57,7 @@ Please refer to [TF-M documentation](https://trustedfirmware-m.readthedocs.io/en
5757
* `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.
60-
Please note that only Cortex-M55 and Cortex-M85 support MVE.
60+
Please note that only Cortex-M52, Cortex-M55 and Cortex-M85 support MVE.
6161
Please refer to [TF-M documentation](https://trustedfirmware-m.readthedocs.io/en/latest/integration_guide/tfm_fpu_support.html) for MVE usage on the Non-Secure side.
6262

6363
* `configENABLE_TRUSTZONE`

0 commit comments

Comments
 (0)