This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e01fb50541 compiler.h: rename CMSE extension attribute macros
e01fb50541 is described below
commit e01fb50541d4d6eb8cf2ba0067458b72e92f5393
Author: raiden00pl <raide...@railab.me>
AuthorDate: Tue Jun 25 10:48:09 2024 +0200
compiler.h: rename CMSE extension attribute macros
rename CMSE extension attribute macros to avoid conflicts with 3rd party
code:
cmse_nonsecure_entry -> tz_nonsecure_netry
cmse_nonsecure_call -> tz_nonsecure_call
---
boards/arm/nrf91/common/src/nrf91_boot_image.c | 2 +-
include/nuttx/compiler.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/boards/arm/nrf91/common/src/nrf91_boot_image.c
b/boards/arm/nrf91/common/src/nrf91_boot_image.c
index 6051477f6c..a717430b2c 100644
--- a/boards/arm/nrf91/common/src/nrf91_boot_image.c
+++ b/boards/arm/nrf91/common/src/nrf91_boot_image.c
@@ -56,7 +56,7 @@
****************************************************************************/
#ifdef CONFIG_NRF91_NONSECURE_BOOT
-typedef void cmse_nonsecure_call nsfunc(void);
+typedef void tz_nonsecure_call nsfunc(void);
#endif
/* This structure represents the first two entries on NVIC vector table */
diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h
index 41dcca4213..2621584c56 100644
--- a/include/nuttx/compiler.h
+++ b/include/nuttx/compiler.h
@@ -491,8 +491,8 @@
/* CMSE extention */
# ifdef CONFIG_ARCH_HAVE_TRUSTZONE
-# define cmse_nonsecure_entry __attribute__((cmse_nonsecure_entry))
-# define cmse_nonsecure_call __attribute__((cmse_nonsecure_call))
+# define tz_nonsecure_entry __attribute__((cmse_nonsecure_entry))
+# define tz_nonsecure_call __attribute__((cmse_nonsecure_call))
# endif
/* SDCC-specific definitions ************************************************/
