[nrf mergeup] Merge upstream up to commit 13f6397

Regular upmerge.

Signed-off-by: Andrzej Głąbek <[email protected]>

Author: anangl

.github/workflows/zephyr_build.yaml

@@ -40,12 +40,12 @@ jobs:
     runs-on: ubuntu-latest
     # Docker image from the zephyr upstream. Includes SDK and other required tools
     container:
-      image: zephyrprojectrtos/ci:v0.21.0
+      image: zephyrprojectrtos/ci:v0.24.2
       options: '--entrypoint /bin/bash'
       volumes:
         - /home/runners/zephyrproject:/github/cache/zephyrproject
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
 
     steps:
       - name: Set versions when workflow_dispatch

boot/boot_serial/src/boot_serial.c

@@ -318,7 +318,8 @@ static off_t erase_range(const struct flash_area *fap, off_t start, off_t end)
     }
 
     size = flash_sector_get_off(&sect) + flash_sector_get_size(&sect) - start;
-    BOOT_LOG_INF("Erasing range 0x%x:0x%x", start, start + size - 1);
+    BOOT_LOG_INF("Erasing range 0x%jx:0x%jx", (intmax_t)start,
+		 (intmax_t)(start + size - 1));
 
     rc = flash_area_erase(fap, start, size);
     if (rc != 0) {
@@ -848,7 +849,14 @@ boot_serial_read_console(const struct boot_uart_funcs *f,int timeout_in_ms)
 
     off = 0;
     while (timeout_in_ms > 0 || bs_entry) {
+        /*
+         * Don't enter CPU idle state here if timeout based serial recovery is
+         * used as otherwise the boot process hangs forever, waiting for input
+         * from serial console (if single-thread mode is used).
+         */
+#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU
         MCUBOOT_CPU_IDLE();
+#endif
         MCUBOOT_WATCHDOG_FEED();
 #ifdef MCUBOOT_SERIAL_WAIT_FOR_DFU
         uint32_t start = k_uptime_get_32();

boot/bootutil/src/loader.c

@@ -2936,6 +2936,7 @@ boot_remove_image_from_flash(struct boot_loader_state *state, uint32_t slot)
     rc = flash_area_open(area_id, &fap);
     if (rc == 0) {
         flash_area_erase(fap, 0, flash_area_get_size(fap));
+        flash_area_close(fap);
     }
 
     return rc;

boot/bootutil/zephyr/CMakeLists.txt

@@ -17,27 +17,12 @@ zephyr_library_sources(
   ../src/bootutil_public.c
     )
 
-if(CONFIG_BOOT_IMAGE_ACCESS_HOOKS)
-  if(NOT CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE STREQUAL "")
-    if(IS_ABSOLUTE ${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-      if(EXISTS ${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-        set(HOOKS_FILE ${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-      endif()
-    elseif((DEFINED CONF_DIR) AND
-           (EXISTS ${CONF_DIR}/${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE}))
-      set(HOOKS_FILE ${CONF_DIR}/${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-    else(EXISTS ${APPLICATION_SOURCE_DIR}/${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-      set(HOOKS_FILE ${APPLICATION_SOURCE_DIR}/${CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE})
-    endif()
-  endif()
-
-  if(DEFINED HOOKS_FILE)
-      zephyr_library_sources(
-        ${HOOKS_FILE}
-      )
-  else()
-    message(STATUS "No hooks implementation file.")
-  endif()
+# Sensitivity to the TEST_BOOT_IMAGE_ACCESS_HOOKS define is implemented for
+# allowing the test-build with the hooks feature enabled.
+if(TEST_BOOT_IMAGE_ACCESS_HOOKS)
+  zephyr_library_sources(
+    ${APPLICATION_SOURCE_DIR}/hooks_sample.c
+  )
 endif()
 
 zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)

boot/nuttx/include/flash_map_backend/flash_map_backend.h

@@ -26,6 +26,10 @@
 
 #include <inttypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -419,4 +423,8 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id);
 
 int flash_area_id_from_image_offset(uint32_t offset);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BOOT_NUTTX_INCLUDE_FLASH_MAP_BACKEND_FLASH_MAP_BACKEND_H */

boot/nuttx/main.c

@@ -32,6 +32,27 @@
 
 #include "flash_map_backend/flash_map_backend.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Should we perform board-specific driver initialization?  There are two
+ * ways that board initialization can occur:  1) automatically via
+ * board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
+ * or 2).
+ * via a call to boardctl() if the interface is enabled
+ * (CONFIG_BOARDCTL=y).
+ * If this task is running as an NSH built-in application, then that
+ * initialization has probably already been performed otherwise we do it
+ * here.
+ */
+
+#undef NEED_BOARDINIT
+
+#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
+#  define NEED_BOARDINIT 1
+#endif
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -79,6 +100,18 @@ int main(int argc, FAR char *argv[])
   struct boot_rsp rsp;
   fih_int fih_rc = FIH_FAILURE;
 
+#ifdef NEED_BOARDINIT
+  /* Perform architecture-specific initialization (if configured) */
+
+  boardctl(BOARDIOC_INIT, 0);
+
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  /* Perform architecture-specific final-initialization (if configured) */
+  
+  boardctl(BOARDIOC_FINALINIT, 0);
+#endif
+#endif
+
   syslog(LOG_INFO, "*** Booting MCUboot build %s ***\n", CONFIG_MCUBOOT_VERSION);
 
   FIH_CALL(boot_go, fih_rc, &rsp);

boot/zephyr/Kconfig

@@ -450,6 +450,7 @@ config BOOT_USB_DFU_DETECT_PIN
 	default 13 if BOARD_NRF52DK_NRF52832
 	default 23 if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPP_NS
 	default 43 if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS
+	default -1
 	help
 	  Pin on the DFU detect port that triggers DFU mode.
 
@@ -558,10 +559,12 @@ endchoice
 
 config BOOT_WATCHDOG_FEED
 	bool "Feed the watchdog while doing swap"
+	default y if WATCHDOG
 	default y if SOC_FAMILY_NRF
-	imply NRFX_WDT
-	imply NRFX_WDT0
-	imply NRFX_WDT1
+	# for nRF nrfx based implementation is available
+	imply NRFX_WDT if SOC_FAMILY_NRF
+	imply NRFX_WDT0 if SOC_FAMILY_NRF
+	imply NRFX_WDT1 if SOC_FAMILY_NRF
 	help
 	  Enables implementation of MCUBOOT_WATCHDOG_FEED() macro which is
 	  used to feed watchdog while doing time consuming operations.
@@ -571,18 +574,8 @@ config BOOT_IMAGE_ACCESS_HOOKS
 	help
 	  Allow to provide procedures for override or extend native
 	  MCUboot's routines required for access the image data and the image
-	  update.
-
-config BOOT_IMAGE_ACCESS_HOOKS_FILE
-	string "Hooks implementation file path"
-	depends on BOOT_IMAGE_ACCESS_HOOKS
-	help
-	  Path to the file which implements hooks.
-	  You can use either absolute or relative path.
-	  In case relative path is used, the build system assumes that it starts
-	  from the directory where the MCUBoot KConfig configuration file is
-	  located. If the key file is not there, the build system uses relative
-	  path that starts from the zephyr port cmake directory (boot/zephyr/).
+	  update. It is up to the project customization to add required source
+	  files to the build.
 
 config MCUBOOT_ACTION_HOOKS
 	bool "Enable hooks for responding to MCUboot status changes"

boot/zephyr/Kconfig.serial_recovery

@@ -70,6 +70,7 @@ config BOOT_SERIAL_DETECT_PIN
 	default 13 if BOARD_NRF52DK_NRF52832 || BOARD_NRF52833DK_NRF52833
 	default 23 if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPP_NS || \
 		BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default -1
 	help
 	  Pin on the serial detect port that triggers serial recovery mode.
 

boot/zephyr/boards/disco_l475_iot1.conf

@@ -1,2 +1,2 @@
 CONFIG_BOOT_MAX_IMG_SECTORS=256
-
+CONFIG_WATCHDOG=y

boot/zephyr/boards/frdm_k64f.conf

@@ -0,0 +1 @@
+CONFIG_WATCHDOG=y