len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-07 05:34:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Resolve merge conflict

Browse source
This commit is contained in:
kar-rahul-aws 2024-01-31 11:54:25 +05:30
commit b6a04e175d
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
examples/template_configuration/FreeRTOSConfig.h
View file

@ -535,26 +535,26 @@
/* ARMv8-M port Specific Configuration definitions. ***************************/
/******************************************************************************/
/* Set configENABLE_TRUSTZONE to 1 when running FreeRTOS on the non-secure side
* to enable the TrustZone support in FreeRTOS ARMv8-M ports which allows the
* non-secure FreeRTOS tasks to call the (non-secure callable) functions
/* Set configENABLE_TRUSTZONE to 1 when running FreeRTOS on the non-secure side
* to enable the TrustZone support in FreeRTOS ARMv8-M ports which allows the
* non-secure FreeRTOS tasks to call the (non-secure callable) functions
* exported from secure side. */
#define configENABLE_TRUSTZONE 1
#define configENABLE_TRUSTZONE 1
/* If the application writer does not want to use TrustZone, but the hardware does
* not support disabling TrustZone then the entire application (including the FreeRTOS
* scheduler) can run on the secure side without ever branching to the non-secure side.
* To do that, in addition to setting configENABLE_TRUSTZONE to 0, also set
* not support disabling TrustZone then the entire application (including the FreeRTOS
* scheduler) can run on the secure side without ever branching to the non-secure side.
* To do that, in addition to setting configENABLE_TRUSTZONE to 0, also set
* configRUN_FREERTOS_SECURE_ONLY to 1. */
#define configRUN_FREERTOS_SECURE_ONLY 1
#define configRUN_FREERTOS_SECURE_ONLY 1
/* Set configENABLE_MPU to 1 to enable the Memory Protection Unit (MPU), or 0
/* Set configENABLE_MPU to 1 to enable the Memory Protection Unit (MPU), or 0
* to leave the Memory Protection Unit disabled. */
#define configENABLE_MPU 1
#define configENABLE_MPU 1
/* Set configENABLE_FPU to 1 to enable the Floating Point Unit (FPU), or 0
/* Set configENABLE_FPU to 1 to enable the Floating Point Unit (FPU), or 0
* to leave the Floating Point Unit disabled. */
#define configENABLE_FPU 1
#define configENABLE_FPU 1
/* Set configENABLE_MVE to 1 to enable the M-Profile Vector Extension (MVE) support,
* or 0 to leave the MVE support disabled. This option is only applicable to Cortex-M55