zephyr: migrate includes to <zephyr/...>
Zephyr has prefixed all of its includes with <zephyr/...>. While the
_old_ mode can still be used (CONFIG_LEGACY_INCLUDE_PATH) and is still
enabled by default, it's better to be prepared for its removal in the
future.
Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
diff --git a/boot/zephyr/include/flash_map_backend/flash_map_backend.h b/boot/zephyr/include/flash_map_backend/flash_map_backend.h
index 6bf027e..5c5fd41 100644
--- a/boot/zephyr/include/flash_map_backend/flash_map_backend.h
+++ b/boot/zephyr/include/flash_map_backend/flash_map_backend.h
@@ -8,7 +8,7 @@
#ifndef __FLASH_MAP_BACKEND_H__
#define __FLASH_MAP_BACKEND_H__
-#include <storage/flash_map.h> // the zephyr flash_map
+#include <zephyr/storage/flash_map.h> // the zephyr flash_map
#ifdef __cplusplus
extern "C" {
diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
index d56b92a..0b4897a 100644
--- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h
+++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
@@ -271,7 +271,7 @@
#endif /* defined(CONFIG_NRFX_WDT0) && defined(CONFIG_NRFX_WDT1) */
#elif CONFIG_IWDG_STM32 /* CONFIG_NRFX_WDT */
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
#define MCUBOOT_WATCHDOG_FEED() \
do { \
diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_logging.h b/boot/zephyr/include/mcuboot_config/mcuboot_logging.h
index 6f24868..dfe1d65 100644
--- a/boot/zephyr/include/mcuboot_config/mcuboot_logging.h
+++ b/boot/zephyr/include/mcuboot_config/mcuboot_logging.h
@@ -27,7 +27,7 @@
#define MCUBOOT_LOG_DBG(...) LOG_DBG(__VA_ARGS__)
#define MCUBOOT_LOG_SIM(...) IGNORE(__VA_ARGS__)
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
#endif /* !__BOOTSIM__ */
diff --git a/boot/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
index 99ca273..95f6cda 100644
--- a/boot/zephyr/include/sysflash/sysflash.h
+++ b/boot/zephyr/include/sysflash/sysflash.h
@@ -3,7 +3,7 @@
#ifndef __SYSFLASH_H__
#define __SYSFLASH_H__
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
#include <mcuboot_config/mcuboot_config.h>
#ifndef CONFIG_SINGLE_APPLICATION_SLOT
diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index 97365c2..5562434 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -19,9 +19,9 @@
* Otherwise, the Zephyr SoC header and the DTS provide most
* everything we need.
*/
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
#include <soc.h>
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
#define FLASH_ALIGN FLASH_WRITE_BLOCK_SIZE