Use cmsis_gcc_m for MAX32657 if CMSIS equal to 6.0

With CMSIS 6.0 cmsis_gcc.h file has been replaced with cmsis_gcc_m.h TF-M uses CMSIS v6.0 to support it without adding a wrapper file max32657.h file has been updated https://github.com/ARM-software/CMSIS_6/blob/v6.0.0/CMSIS/Core/Include/cmsis_version.h https://github.com/zephyrproject-rtos/trusted-firmware-m/blob/main/platform/ext/cmsis/CMSIS/Core/Include/cmsis_version.h Signed-off-by: Sadik Ozer <[email protected]>
analogdevicesinc · Sep 19, 2024 · 669be9f · 669be9f
1 parent 53fc098
commit 669be9f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.h
@@ -152,7 +152,12 @@ typedef enum {
 #define __Vendor_SysTickConfig 0U /**< Is 1 if different SysTick counter is used */
 
 #include <core_cm33.h>
+#if (__CM_CMSIS_VERSION == 0x60000)
+/* If CMSIS version 6.0 use cmsis_gcc_m.h */
+#include <cmsis_gcc_m.h>
+#else
 #include <cmsis_gcc.h>
+#endif
 #include <arm_cmse.h>
 
 #if defined(__GNUC__)