commit b22eb6a30d8328333039fa33405a00ab6494b0d4
author Yonatan Schachter <yonatan.schachter@gmail.com> Fri Jul 29 18:16:09 2022 +0300
committer David Brown <davidb@davidb.org> Tue Oct 04 12:42:36 2022 -0600
tree 603cc1e3c1e7cb5d4389594a66a703a4b64d2ef2
parent b8801fc0ac2e3d9e8c5bc79fcd2bd92e3aa77baf

zephyr: Explicitly include cmsis.h

main.c uses CMSIS functions such as __set_MSP, which require
cmsis.h to be included. Up until now, that file was included
indirectly through other ARM headers. This patch explicitly
includes cmsis.h, for platforms on which those indirect includes
do not work.

Signed-off-by: Yonatan Schachter <yonatan.schachter@gmail.com>
Signed-off-by: David Brown <david.brown@linaro.org>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 073f4d7..86c6432 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -27,6 +27,12 @@
 #include <soc.h>
 #include <zephyr/linker/linker-defs.h>
 
+#if defined(CONFIG_CPU_AARCH32_CORTEX_A) || defined(CONFIG_CPU_AARCH32_CORTEX_R)
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
+#elif defined(CONFIG_CPU_CORTEX_M)
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#endif
+
 #include "target.h"
 
 #include "bootutil/bootutil_log.h"