zephyr: switch to recent defines and include headers

In zephyr code-base some generic include patches
and defines had been deprecated since a while.
This condition was maintained until zephyr v2.1.0 inclusive.

Recently these deprecated items were removed completely from
the zephyr master branch. Zephyr current SHA of this patch is
e124c1cd34938f02bbe879533c6bd29b5ff53707

This patch switch mcuboot to using most recent items.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/boot_serial/src/boot_serial.c

@@ -27,12 +27,12 @@
 #include "bootutil/bootutil_log.h"
 
 #ifdef __ZEPHYR__
-#include <misc/reboot.h>
-#include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <power/reboot.h>
+#include <sys/byteorder.h>
+#include <sys/__assert.h>
 #include <flash.h>
-#include <crc.h>
-#include <base64.h>
+#include <sys/crc.h>
+#include <sys/base64.h>
 #include <cbor.h>
 #else
 #include <bsp/bsp.h>

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 <flash_map.h> // the zephyr flash_map
+#include <storage/flash_map.h> // the zephyr flash_map
 
 #ifdef __cplusplus
 extern "C" {

boot/zephyr/include/target.h

@@ -31,12 +31,12 @@
 #if (!defined(CONFIG_XTENSA) && !defined(DT_FLASH_DEV_NAME)) || \
     (defined(CONFIG_XTENSA) && !defined(DT_JEDEC_SPI_NOR_0_LABEL)) || \
     !defined(FLASH_ALIGN) ||                  \
-    !defined(FLASH_AREA_IMAGE_0_OFFSET) || \
-    !defined(FLASH_AREA_IMAGE_0_SIZE) || \
-    !defined(FLASH_AREA_IMAGE_1_OFFSET) || \
-    !defined(FLASH_AREA_IMAGE_1_SIZE) || \
-    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(FLASH_AREA_IMAGE_SCRATCH_OFFSET)) || \
-    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(FLASH_AREA_IMAGE_SCRATCH_SIZE))
+    !defined(DT_FLASH_AREA_IMAGE_0_OFFSET) || \
+    !defined(DT_FLASH_AREA_IMAGE_0_SIZE) || \
+    !defined(DT_FLASH_AREA_IMAGE_1_OFFSET) || \
+    !defined(DT_FLASH_AREA_IMAGE_1_SIZE) || \
+    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(DT_FLASH_AREA_IMAGE_SCRATCH_OFFSET)) || \
+    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(DT_FLASH_AREA_IMAGE_SCRATCH_SIZE))
 #error "Target support is incomplete; cannot build mcuboot."
 #endif
 

boot/zephyr/main.c

@@ -17,7 +17,7 @@
 #include <assert.h>
 #include <zephyr.h>
 #include <gpio.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <flash.h>
 #include <drivers/timer/system_timer.h>
 #include <usb/usb_device.h>