synchronized up to the mcu-tool/mcuboot 4427e4c

Synchronized to:
mcu-tools/mcuboot@4427e4c

Changes included:
boot: zephyr: allow timeout based recovery with CDC ACM
boot: zephyr: Only call sys_clock_disable when supported
imgtool: fix getpriv format type for keys
mynewt: add flash sector requirement for swap move
ci: add Mynewt test target for swap move
ci: Fix compatibility with packaging==22
boot_serial: Add unaligned stack buffer writing
doc: espressif: Add warning note for Flash Encryption with Serial Recovery usage

Note: The following commits exists in both branches
boot: zephyr: boards: nrf52840dk: Fix overlay
espressif: add downgrade prevention feature
boot: Update Nordic's license identifier tag
docs: fix FIH example command in design.md
ci: fih: update TF-M version to 1.7.0 and adjust test suite

merged using GitHub web gui.

Signed-off-by: Joakim Andersson <[email protected]>

Author: de-nordic

boot/boot_serial/src/boot_serial.c

@@ -511,7 +511,38 @@ bs_upload(char *buf, int len)
 
     BOOT_LOG_INF("Writing at 0x%x until 0x%x", curr_off, curr_off + img_chunk_len);
     /* Write flash aligned chunk, note that img_chunk_len now holds aligned length */
+#if defined(MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE) && MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE > 0
+    if (flash_area_align(fap) > 1 &&
+        (((size_t)img_chunk) & (flash_area_align(fap) - 1)) != 0) {
+        /* Buffer address incompatible with write address, use buffer to write */
+        uint8_t write_size = MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE;
+        uint8_t wbs_aligned[MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE];
+
+        while (img_chunk_len >= flash_area_align(fap)) {
+            if (write_size > img_chunk_len) {
+                write_size = img_chunk_len;
+            }
+
+            memset(wbs_aligned, flash_area_erased_val(fap), sizeof(wbs_aligned));
+            memcpy(wbs_aligned, img_chunk, write_size);
+
+            rc = flash_area_write(fap, curr_off, wbs_aligned, write_size);
+
+            if (rc != 0) {
+                goto out;
+            }
+
+            curr_off += write_size;
+            img_chunk += write_size;
+            img_chunk_len -= write_size;
+        }
+    } else {
+        rc = flash_area_write(fap, curr_off, img_chunk, img_chunk_len);
+    }
+#else
     rc = flash_area_write(fap, curr_off, img_chunk, img_chunk_len);
+#endif
+
     if (rc == 0 && rem_bytes) {
         /* Non-zero rem_bytes means that last chunk needs alignment; the aligned
          * part, in the img_chunk_len - rem_bytes count bytes, has already been

boot/mynewt/flash_map_backend/include/flash_map_backend/flash_map_backend.h

@@ -10,6 +10,7 @@
 #include <sysflash/sysflash.h>
 #include <flash_map/flash_map.h>
 #include <mcuboot_config/mcuboot_config.h>
+#include <unistd.h>  /* off_t */
 
 #if (MCUBOOT_IMAGE_NUMBER == 1)
 
@@ -40,6 +41,13 @@
 int flash_area_id_from_multi_image_slot(int image_index, int slot);
 int flash_area_id_to_multi_image_slot(int image_index, int area_id);
 
+struct flash_sector {
+    uint32_t fs_off;
+    uint32_t fs_size;
+};
+
+int flash_area_sector_from_off(off_t off, struct flash_sector *sector);
+
 static inline uint8_t flash_area_get_id(const struct flash_area *fa)
 {
     return fa->fa_id;
@@ -60,4 +68,9 @@ static inline uint32_t flash_area_get_size(const struct flash_area *fa)
     return fa->fa_size;
 }
 
+static inline uint32_t flash_sector_get_off(const struct flash_sector *fs)
+{
+    return fs->fs_off;
+}
+
 #endif /* __FLASH_MAP_BACKEND_H__ */

boot/mynewt/flash_map_backend/src/flash_map_extended.c

@@ -19,6 +19,8 @@
 
 #include <flash_map/flash_map.h>
 #include <flash_map_backend/flash_map_backend.h>
+#include <hal/hal_bsp.h>
+#include <hal/hal_flash_int.h>
 
 int flash_area_id_from_multi_image_slot(int image_index, int slot)
 {
@@ -42,3 +44,36 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id)
     }
     return 255;
 }
+
+int flash_area_sector_from_off(off_t off, struct flash_sector *sector)
+{
+    const struct flash_area *fa;
+    const struct hal_flash *hf;
+    uint32_t start;
+    uint32_t size;
+    int rc;
+    int i;
+
+    rc = flash_area_open(FLASH_AREA_IMAGE_0, &fa);
+    if (rc != 0) {
+        return -1;
+    }
+
+    rc = -1;
+    hf = hal_bsp_flash_dev(fa->fa_device_id);
+    for (i = 0; i < hf->hf_sector_cnt; i++) {
+        hf->hf_itf->hff_sector_info(hf, i, &start, &size);
+        if (start < fa->fa_off) {
+            continue;
+        }
+        if (off >= start - fa->fa_off && off <= (start - fa->fa_off) + size) {
+            sector->fs_off = start - fa->fa_off;
+            sector->fs_size = size;
+            rc = 0;
+            break;
+        }
+    }
+
+    flash_area_close(fa);
+    return rc;
+}

boot/zephyr/Kconfig.serial_recovery

@@ -51,6 +51,14 @@ config MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD
 	  Note that 0 is default upload target when no explicit
 	  selection is done.
 
+config BOOT_SERIAL_UNALIGNED_BUFFER_SIZE
+	int "Stack buffer for unaligned memory writes"
+	default 64
+	help
+	  Specifies the stack usage for a buffer which is used for unaligned
+	  memory access when data is written to a device with memory alignment
+	  requirements. Set to 0 to disable.
+
 config BOOT_MAX_LINE_INPUT_LEN
 	int "Maximum input line length"
 	default 512
@@ -148,7 +156,7 @@ config BOOT_SERIAL_ENCRYPT_EC256
 
 config BOOT_SERIAL_WAIT_FOR_DFU
 	bool "Wait for a prescribed duration to see if DFU is invoked by receiving a mcumgr comand"
-	depends on BOOT_SERIAL_UART
+	depends on BOOT_SERIAL_UART || BOOT_SERIAL_CDC_ACM
 	help
 	  If y, MCUboot waits for a prescribed duration of time to allow
 	  for DFU to be invoked. The serial recovery can be entered by receiving any

boot/zephyr/include/mcuboot_config/mcuboot_config.h

@@ -245,6 +245,10 @@
 #define MCUBOOT_SERIAL_MAX_RECEIVE_SIZE CONFIG_BOOT_SERIAL_MAX_RECEIVE_SIZE
 #endif
 
+#ifdef CONFIG_BOOT_SERIAL_UNALIGNED_BUFFER_SIZE
+#define MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE CONFIG_BOOT_SERIAL_UNALIGNED_BUFFER_SIZE
+#endif
+
 /* Support 32-byte aligned flash sizes */
 #if DT_HAS_CHOSEN(zephyr_flash)
     #if DT_PROP_OR(DT_CHOSEN(zephyr_flash), write_block_size, 0) > 8

boot/zephyr/main.c

@@ -190,7 +190,9 @@ static void do_boot(struct boot_rsp *rsp)
                                      rsp->br_hdr->ih_hdr_size);
 #endif
 
-    sys_clock_disable();
+    if (IS_ENABLED(CONFIG_SYSTEM_TIMER_HAS_DISABLE_SUPPORT)) {
+        sys_clock_disable();
+    }
 
 #ifdef CONFIG_USB_DEVICE_STACK
     /* Disable the USB to prevent it from firing interrupts */

ci/compare_versions.py

@@ -12,10 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from packaging.version import parse, LegacyVersion
+from packaging.version import parse, InvalidVersion
 import argparse
 import sys
 
+try:
+    from packaging.version import LegacyVersion
+except ImportError:
+    LegacyVersion = ()  # trick isinstance!
+
 # exit with 0 if --new is equal to --old
 # exit with 1 on errors
 # exit with 2 if --new is newer than --old
@@ -30,9 +35,20 @@
     parser.print_help()
     exit(1)
 
-old, new = parse(args.old), parse(args.new)
+# packaging>=22 only supports PEP-440 version numbers, and a non-valid version
+# will throw InvalidVersion. Previous packaging releases would create a
+# LegacyVersion object if the given version string failed to parse as PEP-440,
+# and since we use versions closer to semver, we want to fail in that case.
+
+versions = []
+for version in [args.old, args.new]:
+    try:
+        versions.append(parse(version))
+    except InvalidVersion:
+        print("Invalid version parsed: {}".format(version))
+        sys.exit(1)
 
-# only accept versions that were correctly parsed
+old, new = versions[0], versions[1]
 for version in [old, new]:
     if isinstance(version, LegacyVersion):
         print("Invalid version parsed: {}".format(version))

ci/mynewt_targets/swap_move/pkg.yml

@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: "targets/swap_move"
+pkg.type: "target"
+pkg.description:
+pkg.author:
+pkg.homepage:
+
+pkg.deps:
+    - "@mcuboot/boot/mynewt"

ci/mynewt_targets/swap_move/syscfg.yml

@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.vals:
+    BOOT_SERIAL: 0
+    BOOT_SERIAL_DETECT_PIN: 11
+    BOOT_SERIAL_DETECT_PIN_VAL: 0
+    BOOT_SERIAL_REPORT_PIN: 13
+    BOOTUTIL_VALIDATE_SLOT0: 0
+    BOOTUTIL_MAX_IMG_SECTORS: 256
+    BOOTUTIL_SWAP_USING_MOVE: 1
+    BOOTUTIL_SIGN_EC256: 0
+    BOOTUTIL_SIGN_RSA: 0
+    BOOTUTIL_ENCRYPT_RSA: 0
+    BOOTUTIL_ENCRYPT_KW: 0
+    BOOTUTIL_USE_MBED_TLS: 0
+    BOOTUTIL_USE_TINYCRYPT: 1
+    BOOTUTIL_OVERWRITE_ONLY: 0
+    BOOTUTIL_OVERWRITE_ONLY_FAST: 1
+    BOOTUTIL_HAVE_LOGGING: 0
+    BOOTUTIL_NO_LOGGING: 1
+    BOOTUTIL_LOG_LEVEL: 'BOOTUTIL_LOG_LEVEL_INFO'
+    CONSOLE_COMPAT: 1
+    CONSOLE_INPUT: 0
+    CONSOLE_UART: 0
+    CONSOLE_RTT: 0
+    OS_CPUTIME_TIMER_NUM: 0
+    TIMER_0: 1
+    UART_0: 0
+    BOOTUTIL_BOOTSTRAP: 0
+    MBEDTLS_NIST_KW_C: 0

ci/mynewt_targets/swap_move/target.yml

@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+target.app: "@mcuboot/boot/mynewt"
+target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10056"
+target.build_profile: "optimized"