diff options
author | IsaacDynamo <61521674+IsaacDynamo@users.noreply.github.com> | 2024-01-17 23:22:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-17 23:22:32 +0300 |
commit | c083af972ab1172aa09938e910ed9451053a9fcf (patch) | |
tree | 5b27d77e10feb0738e7b067b66630751a6deb255 | |
parent | c053ffeacc655a8d2610c63f388f2fc1210b096d (diff) |
Add mpu_wrappers_v2_asm.c to MPU ports (#951)
Co-authored-by: Soren Ptak <ptaksoren@gmail.com>
-rw-r--r-- | portable/CMakeLists.txt | 80 |
1 files changed, 55 insertions, 25 deletions
diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt index dea052d98..9df221d21 100644 --- a/portable/CMakeLists.txt +++ b/portable/CMakeLists.txt @@ -88,11 +88,13 @@ add_library(freertos_kernel_port STATIC GCC/ARM_CM3/port.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM3_MPU>: - GCC/ARM_CM3_MPU/port.c> + GCC/ARM_CM3_MPU/port.c + GCC/ARM_CM3_MPU/mpu_wrappers_v2_asm.c> # ARMv7E-M ports for GCC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM4_MPU>: - GCC/ARM_CM4_MPU/port.c> + GCC/ARM_CM4_MPU/port.c + GCC/ARM_CM4_MPU/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM4F>: GCC/ARM_CM4F/port.c> @@ -103,7 +105,8 @@ add_library(freertos_kernel_port STATIC # ARMv8-M ports for GCC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM23_NONSECURE>: GCC/ARM_CM23/non_secure/port.c - GCC/ARM_CM23/non_secure/portasm.c> + GCC/ARM_CM23/non_secure/portasm.c + GCC/ARM_CM23/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM23_SECURE>: GCC/ARM_CM23/secure/secure_context_port.c @@ -113,11 +116,13 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM23_NTZ_NONSECURE>: GCC/ARM_CM23_NTZ/non_secure/port.c - GCC/ARM_CM23_NTZ/non_secure/portasm.c> + GCC/ARM_CM23_NTZ/non_secure/portasm.c + GCC/ARM_CM23_NTZ/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM33_NONSECURE>: GCC/ARM_CM33/non_secure/port.c - GCC/ARM_CM33/non_secure/portasm.c> + GCC/ARM_CM33/non_secure/portasm.c + GCC/ARM_CM33/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM33_SECURE>: GCC/ARM_CM33/secure/secure_context_port.c @@ -127,16 +132,19 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM33_NTZ_NONSECURE>: GCC/ARM_CM33_NTZ/non_secure/port.c - GCC/ARM_CM33_NTZ/non_secure/portasm.c> + GCC/ARM_CM33_NTZ/non_secure/portasm.c + GCC/ARM_CM33_NTZ/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM33_TFM>: GCC/ARM_CM33_NTZ/non_secure/port.c GCC/ARM_CM33_NTZ/non_secure/portasm.c + GCC/ARM_CM33_NTZ/non_secure/mpu_wrappers_v2_asm.c ThirdParty/GCC/ARM_TFM/os_wrapper_freertos.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM35P_NONSECURE>: GCC/ARM_CM35P/non_secure/port.c - GCC/ARM_CM35P/non_secure/portasm.c> + GCC/ARM_CM35P/non_secure/portasm.c + GCC/ARM_CM35P/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM35P_SECURE>: GCC/ARM_CM35P/secure/secure_context_port.c @@ -146,12 +154,14 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM35P_NTZ_NONSECURE>: GCC/ARM_CM35P_NTZ/non_secure/port.c - GCC/ARM_CM35P_NTZ/non_secure/portasm.c> + GCC/ARM_CM35P_NTZ/non_secure/portasm.c + GCC/ARM_CM35P_NTZ/non_secure/mpu_wrappers_v2_asm.c> # ARMv8.1-M ports for GCC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM55_NONSECURE>: GCC/ARM_CM55/non_secure/port.c - GCC/ARM_CM55/non_secure/portasm.c> + GCC/ARM_CM55/non_secure/portasm.c + GCC/ARM_CM55/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM55_SECURE>: GCC/ARM_CM55/secure/secure_context_port.c @@ -161,16 +171,19 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM55_NTZ_NONSECURE>: GCC/ARM_CM55_NTZ/non_secure/port.c - GCC/ARM_CM55_NTZ/non_secure/portasm.c> + GCC/ARM_CM55_NTZ/non_secure/portasm.c + GCC/ARM_CM55_NTZ/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM55_TFM>: GCC/ARM_CM55_NTZ/non_secure/port.c GCC/ARM_CM55_NTZ/non_secure/portasm.c + GCC/ARM_CM55_NTZ/non_secure/mpu_wrappers_v2_asm.c ThirdParty/GCC/ARM_TFM/os_wrapper_freertos.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_NONSECURE>: GCC/ARM_CM85/non_secure/port.c - GCC/ARM_CM85/non_secure/portasm.c> + GCC/ARM_CM85/non_secure/portasm.c + GCC/ARM_CM85/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_SECURE>: GCC/ARM_CM85/secure/secure_context_port.c @@ -180,11 +193,13 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_NTZ_NONSECURE>: GCC/ARM_CM85_NTZ/non_secure/port.c - GCC/ARM_CM85_NTZ/non_secure/portasm.c> + GCC/ARM_CM85_NTZ/non_secure/portasm.c + GCC/ARM_CM85_NTZ/non_secure/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM85_TFM>: GCC/ARM_CM85_NTZ/non_secure/port.c GCC/ARM_CM85_NTZ/non_secure/portasm.c + GCC/ARM_CM85_NTZ/non_secure/mpu_wrappers_v2_asm.c ThirdParty/GCC/ARM_TFM/os_wrapper_freertos.c> # ARMv7-R ports for GCC @@ -391,7 +406,8 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM4F_MPU>: IAR/ARM_CM4F_MPU/port.c - IAR/ARM_CM4F_MPU/portasm.s> + IAR/ARM_CM4F_MPU/portasm.s + IAR/ARM_CM4F_MPU/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM7>: IAR/ARM_CM7/r0p1/port.c @@ -400,7 +416,8 @@ add_library(freertos_kernel_port STATIC # ARMv8-M Ports for IAR EWARM $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM23_NONSECURE>: IAR/ARM_CM23/non_secure/port.c - IAR/ARM_CM23/non_secure/portasm.s> + IAR/ARM_CM23/non_secure/portasm.s + IAR/ARM_CM23/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM23_SECURE>: IAR/ARM_CM23/secure/secure_context_port_asm.s @@ -410,11 +427,13 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM23_NTZ_NONSECURE>: IAR/ARM_CM23_NTZ/non_secure/port.c - IAR/ARM_CM23_NTZ/non_secure/portasm.s> + IAR/ARM_CM23_NTZ/non_secure/portasm.s + IAR/ARM_CM23_NTZ/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM33_NONSECURE>: IAR/ARM_CM33/non_secure/port.c - IAR/ARM_CM33/non_secure/portasm.s> + IAR/ARM_CM33/non_secure/portasm.s + IAR/ARM_CM33/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM33_SECURE>: IAR/ARM_CM33/secure/secure_context_port_asm.s @@ -424,11 +443,13 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM33_NTZ_NONSECURE>: IAR/ARM_CM33_NTZ/non_secure/port.c - IAR/ARM_CM33_NTZ/non_secure/portasm.s> + IAR/ARM_CM33_NTZ/non_secure/portasm.s + IAR/ARM_CM33_NTZ/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM35P_NONSECURE>: IAR/ARM_CM35P/non_secure/port.c - IAR/ARM_CM35P/non_secure/portasm.s> + IAR/ARM_CM35P/non_secure/portasm.s + IAR/ARM_CM35P/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM35P_SECURE>: IAR/ARM_CM35P/secure/secure_context_port_asm.s @@ -438,12 +459,14 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM35P_NTZ_NONSECURE>: IAR/ARM_CM35P_NTZ/non_secure/port.c - IAR/ARM_CM35P_NTZ/non_secure/portasm.s> + IAR/ARM_CM35P_NTZ/non_secure/portasm.s + IAR/ARM_CM35P_NTZ/non_secure/mpu_wrappers_v2_asm.S> # ARMv8.1-M ports for IAR EWARM $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM55_NONSECURE>: IAR/ARM_CM55/non_secure/port.c - IAR/ARM_CM55/non_secure/portasm.s> + IAR/ARM_CM55/non_secure/portasm.s + IAR/ARM_CM55/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM55_SECURE>: IAR/ARM_CM55/secure/secure_context_port_asm.s @@ -453,11 +476,13 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM55_NTZ_NONSECURE>: IAR/ARM_CM55_NTZ/non_secure/port.c - IAR/ARM_CM55_NTZ/non_secure/portasm.s> + IAR/ARM_CM55_NTZ/non_secure/portasm.s + IAR/ARM_CM55_NTZ/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_NONSECURE>: IAR/ARM_CM85/non_secure/port.c - IAR/ARM_CM85/non_secure/portasm.s> + IAR/ARM_CM85/non_secure/portasm.s + IAR/ARM_CM85/non_secure/mpu_wrappers_v2_asm.S> $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_SECURE>: IAR/ARM_CM85/secure/secure_context_port_asm.s @@ -467,7 +492,8 @@ add_library(freertos_kernel_port STATIC $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CM85_NTZ_NONSECURE>: IAR/ARM_CM85_NTZ/non_secure/port.c - IAR/ARM_CM85_NTZ/non_secure/portasm.s> + IAR/ARM_CM85_NTZ/non_secure/portasm.s + IAR/ARM_CM85_NTZ/non_secure/mpu_wrappers_v2_asm.S> # ARMv7-R Ports for IAR EWARM $<$<STREQUAL:${FREERTOS_PORT},IAR_ARM_CRX_NOGIC>: @@ -659,7 +685,8 @@ add_library(freertos_kernel_port STATIC # ARMv7E-M ports for ARM RVDS / armcc $<$<STREQUAL:${FREERTOS_PORT},RVDS_ARM_CM4_MPU>: - RVDS/ARM_CM4_MPU/port.c> + RVDS/ARM_CM4_MPU/port.c + RVDS/ARM_CM4_MPU/mpu_wrappers_v2_asm.c> $<$<STREQUAL:${FREERTOS_PORT},RVDS_ARM_CM4F>: RVDS/ARM_CM4F/port.c> @@ -723,7 +750,10 @@ if( FREERTOS_PORT MATCHES "GCC_ARM_CM(3|4)_MPU" OR FREERTOS_PORT MATCHES "IAR_ARM_CM(23|33|55|85)_NTZ_NONSECURE" OR FREERTOS_PORT MATCHES "IAR_ARM_CM(23|33|55|85)_NONSECURE" ) - target_sources(freertos_kernel_port PRIVATE Common/mpu_wrappers.c) + target_sources(freertos_kernel_port PRIVATE + Common/mpu_wrappers.c + Common/mpu_wrappers_v2.c + ) endif() target_include_directories(freertos_kernel_port PUBLIC |