michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch: arm: mpu: Fix BUILD_ASSERT on pointer value

Browse Source 
Some compilers (iccarm included) does not support BUILD_ASSERT()
to check alignment of arrays.

This fix checks if an IAR compiler is used and disables the
start-alignment check if it is.

Signed-off-by: Björn Bergman <bjorn.bergman@iar.com>
This commit is contained in:
Björn Bergman
2025-02-27 11:53:30 +01:00
committed by Benjamin Cabé
parent 43b43f5408
commit d34d554d60
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/zephyr/arch/arm/mpu/arm_mpu_v7m.h
View File

@@ -273,10 +273,21 @@ typedef struct {
#endif /* _ASMLANGUAGE */
#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
#define _ARCH_MEM_PARTITION_ALIGN_CHECK_SIZE(size) \
BUILD_ASSERT(!(((size) & ((size) - 1))) && \
(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE && \
!((uint32_t)(start) & ((size) - 1)), \
(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE, \
"The size of the partition must be power of 2 and greater than or equal to " \
"the minimum MPU region size.\n" \
"the minimum MPU region size.\n")
/* Some compilers do not handle BUILD_ASSERT on the values of pointers.*/
#if defined(__IAR_SYSTEMS_ICC__)
#define _ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size)
#else
#define _ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size) \
BUILD_ASSERT(!((uint32_t)(start) & ((size) - 1)), \
"The start address of the partition must align with size.")
#endif
#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
_ARCH_MEM_PARTITION_ALIGN_CHECK_SIZE(size); \
_ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size)