commit 3cd2cece690c66186b9e1eaa74163e0d3cca4af0
author Gerard Marull-Paretas <gerard@teslabs.com> Mon May 09 12:10:05 2022 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jun 16 21:47:43 2022 +0200
tree bb6887b3c6b7ca64d082af5be18c70ae7e2eaaf4
parent 65e1314058341cf01e61f605b892660668389e00

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>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index c9da8e5..b1c394f 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -17,15 +17,15 @@
  */
 
 #include <assert.h>
-#include <zephyr.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <sys/__assert.h>
-#include <drivers/flash.h>
-#include <drivers/timer/system_timer.h>
-#include <usb/usb_device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/usb/usb_device.h>
 #include <soc.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 #include "target.h"
 
@@ -47,7 +47,7 @@
 #endif
 
 #if defined(CONFIG_BOOT_USB_DFU_WAIT) || defined(CONFIG_BOOT_USB_DFU_GPIO)
-#include <usb/class/usb_dfu.h>
+#include <zephyr/usb/class/usb_dfu.h>
 #endif
 
 #if CONFIG_MCUBOOT_CLEANUP_ARM_CORE
@@ -74,7 +74,7 @@
 #warning "The log internal thread for log processing can't transfer the log"\
          "well for MCUBoot."
 #else
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #define BOOT_LOG_PROCESSING_INTERVAL K_MSEC(30) /* [ms] */