Support STM32L5 family with TZ=0

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

src/FreeRTOSConfig_Default.h

@@ -23,11 +23,10 @@
  * http://aws.amazon.com/freertos
  *
  * 1 tab == 4 spaces!
-*/
-
+ */
 
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
+#ifndef FREERTOS_CONFIG_DEFAULT_H
+#define FREERTOS_CONFIG_DEFAULT_H
 
 /*-----------------------------------------------------------
  * Application specific definitions.
@@ -140,28 +139,38 @@ extern char _Min_Stack_Size; /* Defined in the linker script */
  */
 #define configUSE_NEWLIB_REENTRANT 1
 
+/* Set configENABLE_MPU to 1 to enable MPU support and 0 to disable it. This is
+currently used in ARMv8M ports. */
+#define configENABLE_MPU 0
+/* Set configENABLE_FPU to 1 to enable FPU support and 0 to disable it. This is
+currently used in ARMv8M ports. */
+#define configENABLE_FPU 1
+/* Set configENABLE_TRUSTZONE to 1 enable TrustZone support and 0 to disable it.
+This is currently used in ARMv8M ports. */
+#define configENABLE_TRUSTZONE 0
+
 /* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 0
-#define configMAX_CO_ROUTINE_PRIORITIES (2)
+#define configUSE_CO_ROUTINES  0
+#define configMAX_CO_ROUTINE_PRIORITIES  (2)
 
 /* Software timer definitions. */
-#define configUSE_TIMERS 1
-#define configTIMER_TASK_PRIORITY (2)
-#define configTIMER_QUEUE_LENGTH 10
-#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 2)
+#define configUSE_TIMERS  1
+#define configTIMER_TASK_PRIORITY  (2)
+#define configTIMER_QUEUE_LENGTH  10
+#define configTIMER_TASK_STACK_DEPTH  (configMINIMAL_STACK_SIZE * 2)
 
 /* Set the following definitions to 1 to include the API function, or zero
 to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 1
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_xTaskGetSchedulerState 1
+#define INCLUDE_vTaskPrioritySet  1
+#define INCLUDE_uxTaskPriorityGet  1
+#define INCLUDE_vTaskDelete  1
+#define INCLUDE_vTaskCleanUpResources  1
+#define INCLUDE_vTaskSuspend  1
+#define INCLUDE_vTaskDelayUntil  1
+#define INCLUDE_vTaskDelay  1
+#define INCLUDE_xTaskGetSchedulerState  1
 #define INCLUDE_uxTaskGetStackHighWaterMark 1
-#define INCLUDE_xTaskGetIdleTaskHandle 1
+#define INCLUDE_xTaskGetIdleTaskHandle  1
 
 #if defined(configUSE_CMSIS_RTOS_V2) && (configUSE_CMSIS_RTOS_V2 == 1)
 #define INCLUDE_xSemaphoreGetMutexHolder 1
@@ -173,9 +182,9 @@ to exclude the API function. */
 /* Cortex-M specific definitions. */
 #ifdef __NVIC_PRIO_BITS
  /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
- #define configPRIO_BITS __NVIC_PRIO_BITS
+ #define configPRIO_BITS  __NVIC_PRIO_BITS
 #else
- #define configPRIO_BITS 4 /* 15 priority levels */
+ #define configPRIO_BITS  4 /* 15 priority levels */
 #endif
 
 /* The lowest interrupt priority that can be used in a call to a "set priority"
@@ -206,8 +215,7 @@ header file. */
 
 /*
  * IMPORTANT:
- * osSystickHandler is called in the core SysTick_Handler definition
- * and is defined as weak.
+ * osSystickHandler is called in the core SysTick_Handler definition and is defined as weak.
  * For CMSIS-RTOSv2: osSystickHandler is defined as xPortSysTickHandler
  * For CMSIS-RTOS: osSystickHandler is defined by the cmsis_os and xPortSysTickHandler
  * must not be defined to prevent overwriting SysTick_Handler
@@ -217,5 +225,5 @@ header file. */
 #define xPortSysTickHandler osSystickHandler
 #endif
 
-#endif /* FREERTOS_CONFIG_H */
+#endif /* FREERTOS_CONFIG_DEFAULT_H */
 

src/mpu_wrappers.h

@@ -0,0 +1,8 @@
+/*
+ * @file mpu_wrappers.h
+ * @author Frederic Pillon <frederic.pillon@st.com> for STMicroelectronics.
+ * @brief Include source file to match Arduino library format
+ */
+
+/* MPU not supported */
+#include "FreeRTOS/Source/include/mpu_wrappers.h"

src/port.c

@@ -9,11 +9,11 @@
 #pragma GCC error "no \"__CORTEX_M\" definition"
 #endif
 
-#if (__CORTEX_M == 0x00U)
+#if (__CORTEX_M == 0U)
 #include "../portable/GCC/ARM_CM0/port.c"
 #endif
 
-#if (__CORTEX_M == 0x03U)
+#if (__CORTEX_M == 3U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM3_MPU/port.c"
@@ -22,7 +22,7 @@
 #endif
 #endif
 
-#if (__CORTEX_M == 0x04U)
+#if (__CORTEX_M == 4U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM4_MPU/port.c"
@@ -31,11 +31,16 @@
 #endif
 #endif
 
-#if (__CORTEX_M == 0x07U)
+#if (__CORTEX_M == 7U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM7_MPU/r0p1/port.c"
 #else
 #include "../portable/GCC/ARM_CM7/r0p1/port.c"
 #endif
 #endif
+
+#if (__CORTEX_M == 33U)
+/* TZ = 0 */
+#include "../portable/GCC/ARM_CM33_NTZ/non_secure/port.c"
+#endif

src/portasm.c

@@ -0,0 +1,15 @@
+/*
+ * @file portasm.c
+ * @author Frederic Pillon <frederic.pillon@st.com> for STMicroelectronics.
+ * @brief Include source of FreeRTOS portable layer file to match Arduino library format
+ */
+#include <Arduino.h>
+
+#ifndef __CORTEX_M
+#pragma GCC error "no \"__CORTEX_M\" definition"
+#endif
+
+#if (__CORTEX_M == 33U)
+/* TZ = 0 */
+#include "../portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c"
+#endif

src/portasm.h

@@ -0,0 +1,20 @@
+/*
+ * @file portasm.h
+ * @author Frederic Pillon <frederic.pillon@st.com> for STMicroelectronics.
+ * @brief Include header of FreeRTOS portable layer file to match Arduino library format
+ */
+
+#ifndef _PORTASM_H_
+#define _PORTASM_H_
+#include "stm32_def.h"
+
+#ifndef __CORTEX_M
+#pragma GCC error "no \"__CORTEX_M\" definition"
+#endif
+
+#if (__CORTEX_M == 33U)
+/* TZ = 0 */
+#include "../portable/GCC/ARM_CM33_NTZ/non_secure/portasm.h"
+#endif
+
+#endif //_PORTASM_H_

src/portmacro.h

@@ -12,13 +12,13 @@
 #pragma GCC error "no \"__CORTEX_M\" definition"
 #endif
 
-#if (__CORTEX_M == 0x00U)
+#if (__CORTEX_M == 0U)
 #include "../portable/GCC/ARM_CM0/portmacro.h"
 /* Stub for heap_useNewlib_ST */
 inline __attribute__(( always_inline )) static BaseType_t xPortIsInsideInterrupt( void ) { return pdFALSE; }
 #endif
 
-#if (__CORTEX_M == 0x03U)
+#if (__CORTEX_M == 3U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM3_MPU/portmacro.h"
@@ -27,7 +27,7 @@ inline __attribute__(( always_inline )) static BaseType_t xPortIsInsideInterrupt
 #endif
 #endif
 
-#if (__CORTEX_M == 0x04U)
+#if (__CORTEX_M == 4U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM4_MPU/portmacro.h"
@@ -36,7 +36,7 @@ inline __attribute__(( always_inline )) static BaseType_t xPortIsInsideInterrupt
 #endif
 #endif
 
-#if (__CORTEX_M == 0x07U)
+#if (__CORTEX_M == 7U)
 /* MPU not supported */
 #if 0 /*(__MPU_PRESENT == 1)*/
 #include "../portable/GCC/ARM_CM7_MPU/r0p1/portmacro.h"
@@ -45,4 +45,8 @@ inline __attribute__(( always_inline )) static BaseType_t xPortIsInsideInterrupt
 #endif
 #endif
 
+#if (__CORTEX_M == 33U)
+#include "../portable/GCC/ARM_CM33_NTZ/non_secure/portmacro.h"
+#endif
+
 #endif //_PORTMACRO_H_