dfu/boot: rework using newly introduced MCUBOOT_BOOTUTIL library

include/dfu/mcuboot.h

@@ -17,26 +17,58 @@
 extern "C" {
 #endif
 
+#ifdef BOOT_SWAP_TYPE_NONE
+#if BOOT_SWAP_TYPE_NONE != 1 /*ensure the same definition in MCUboot */
+#error "definition incompatible"
+#endif
+#else
 /** Attempt to boot the contents of slot 0. */
 #define BOOT_SWAP_TYPE_NONE     1
+#endif
 
+#ifdef BOOT_SWAP_TYPE_TEST
+#if BOOT_SWAP_TYPE_TEST != 2  /*ensure the same definition in MCUboot */
+#error "definition incompatible"
+#endif
+#else
 /** Swap to slot 1.  Absent a confirm command, revert back on next boot. */
 #define BOOT_SWAP_TYPE_TEST     2
+#endif
 
+#ifdef BOOT_SWAP_TYPE_PERM
+#if BOOT_SWAP_TYPE_PERM != 3  /*ensure the same definition in MCUboot */
+#error "definition incompatible"
+#endif
+#else
 /** Swap to slot 1, and permanently switch to booting its contents. */
 #define BOOT_SWAP_TYPE_PERM     3
+#endif
 
+#ifdef BOOT_SWAP_TYPE_REVERT
+#if BOOT_SWAP_TYPE_REVERT != 4  /*ensure the same definition in MCUboot */
+#error "definition incompatible"
+#endif
+#else
 /** Swap back to alternate slot.  A confirm changes this state to NONE. */
 #define BOOT_SWAP_TYPE_REVERT   4
+#endif
 
+#ifdef BOOT_SWAP_TYPE_FAIL
+#if BOOT_SWAP_TYPE_FAIL != 5  /*ensure the same definition in MCUboot */
+#error "definition incompatible"
+#endif
+#else
 /** Swap failed because image to be run is not valid */
 #define BOOT_SWAP_TYPE_FAIL     5
+#endif
 
 #define BOOT_IMG_VER_STRLEN_MAX 25  /* 255.255.65535.4294967295\0 */
 
 /* Trailer: */
 #define BOOT_MAX_ALIGN		8
+#ifndef BOOT_MAGIC_SZ
 #define BOOT_MAGIC_SZ		16
+#endif
 
 #define BOOT_TRAILER_IMG_STATUS_OFFS(bank_area) ((bank_area)->fa_size -\
 						  BOOT_MAGIC_SZ -\

modules/Kconfig

@@ -31,3 +31,4 @@ source "modules/Kconfig.tinycbor"
 source "modules/Kconfig.tinycrypt"
 source "modules/Kconfig.vega"
 source "modules/Kconfig.xtensa"
+source "modules/Kconfig.mcuboot_bootutil"

modules/Kconfig.mcuboot_bootutil

@@ -0,0 +1,24 @@
+# Copyright (c) 2020 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig MCUBOOT_BOOTUTIL_LIB
+	bool "MCUboot utility library"
+	help
+	  Enable MCUboot utility library which implements functions
+	  required by the chain-loaded application and the MCUboot.
+
+if MCUBOOT_BOOTUTIL_LIB
+
+# hiden option for disabling module-own log configuration
+# while building MCUboot bootloader
+config MCUBOOT_BOOTUTIL_LIB_OWN_LOG
+	bool
+	default y
+
+if MCUBOOT_BOOTUTIL_LIB_OWN_LOG
+module = MCUBOOT_UTIL
+module-str = MCUboot bootutil
+source "subsys/logging/Kconfig.template.log_config"
+endif
+
+endif # MCUBOOT_BOOTUTIL_LIB

subsys/dfu/Kconfig

@@ -25,6 +25,7 @@ choice
 config MCUBOOT_IMG_MANAGER
 	bool "Image manager for mcuboot"
 	select FLASH_MAP
+	select MCUBOOT_BOOTUTIL_LIB
 	help
 	  Enable support for managing DFU image downloaded using mcuboot.
 

subsys/dfu/boot/CMakeLists.txt

@@ -1,4 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources_ifdef(CONFIG_MCUBOOT_IMG_MANAGER mcuboot.c)
-zephyr_sources_ifdef(CONFIG_MCUBOOT_SHELL mcuboot_shell.c)
+if(CONFIG_MCUBOOT_IMG_MANAGER)
+zephyr_library()
+zephyr_library_sources(mcuboot.c)
+zephyr_library_sources_ifdef(CONFIG_MCUBOOT_SHELL mcuboot_shell.c)
+zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+endif()