From aa07289c24dd631a7d3d55781a9c5fa9017d5db8 Mon Sep 17 00:00:00 2001 From: IsaacDynamo <61521674+IsaacDynamo@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:02:41 +0100 Subject: [PATCH] Make configSUPPORT_STATIC_ALLOCATION==1 an error for MPU ports (#953) * Error when configSUPPORT_STATIC_ALLOCATION is set for MPU ports * Uncrustify: triggered by comment. --------- Co-authored-by: GitHub Action Co-authored-by: Soren Ptak --- tasks.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tasks.c b/tasks.c index 93e9c02c4..d00e96674 100644 --- a/tasks.c +++ b/tasks.c @@ -41,6 +41,13 @@ #include "timers.h" #include "stack_macros.h" +/* The default definitions are only available for non-MPU ports. The + * reason is that the stack alignment requirements vary for different + * architectures.*/ +#if ( ( configSUPPORT_STATIC_ALLOCATION == 1 ) && ( configKERNEL_PROVIDED_STATIC_MEMORY == 1 ) && ( portUSING_MPU_WRAPPERS != 0 ) ) + #error configKERNEL_PROVIDED_STATIC_MEMORY cannot be set to 1 when using an MPU port. The vApplicationGet*TaskMemory() functions must be provided manually. +#endif + /* The MPU ports require MPU_WRAPPERS_INCLUDED_FROM_API_FILE to be defined * for the header files above, but not in this file, in order to generate the * correct privileged Vs unprivileged linkage and placement. */