Zephyr: In PR #60031 aarch32 directory was removed now use cmsis_core.h

Author: Kai Meinhard

ports/zephyr/common/memfault_platform_coredump_regions.c

@@ -15,7 +15,8 @@
 #include "memfault/ports/zephyr/version.h"
 
 #if MEMFAULT_ZEPHYR_VERSION_GT(2, 1)
-  #include <arch/arm/aarch32/cortex_m/cmsis.h>
+  //#include <arch/arm/aarch32/cortex_m/cmsis.h>
+  #include <cmsis_core.h>
 #else
   #include <arch/arm/cortex_m/cmsis.h>
 #endif

ports/zephyr/v2.4/memfault_fault_handler.c

@@ -23,7 +23,7 @@
 // Starting in v3.4, the handler set function was renamed and the declaration
 // added to a public header
 #if MEMFAULT_ZEPHYR_VERSION_GT(3, 3)
-  #include <arch/arm/aarch32/nmi.h>
+  #include <cmsis_core.h>
   #define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_arm_nmi_set_handler
 #else
   #define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_NmiHandlerSet