[nrf mergeup] merge upsteram up to commit 5c877d5

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Author: nvlsianpu

boot/zephyr/boards/nrf51_pca10028.conf

@@ -1,5 +1,6 @@
-# Due the small boot partition can't use logging and debug optimalization
-# out-off-the-box. For using these features need to increase boot partition via
-# zephyr DTS.
-CONFIG_BOOT_HAVE_LOGGING=n
+# Due the small boot partition, we can't enable logging or the debug
+# optimization level out off the box. You need to increase the boot
+# partition size with a zephyr DTS overlay to make MCUboot's debug
+# builds fit.
+CONFIG_LOG=n
 CONFIG_SIZE_OPTIMIZATIONS=y

boot/zephyr/boards/nrf52840_pca10059.conf

@@ -1,7 +1,7 @@
 # The UART is used for Serial Recovery, so logging requires
 # an RTT console, which is not available out of the box on this board.
 # Disable logging.
-CONFIG_BOOT_HAVE_LOGGING=n
+CONFIG_LOG=n
 
 # Serial
 CONFIG_SERIAL=y

boot/zephyr/include/mcuboot_config/mcuboot_config.h

@@ -43,7 +43,7 @@
 #define MCUBOOT_OVERWRITE_ONLY_FAST
 #endif
 
-#ifdef CONFIG_BOOT_HAVE_LOGGING
+#ifdef CONFIG_LOG
 #define MCUBOOT_HAVE_LOGGING 1
 #endif