[nrf mergeup] Merge upstream up to commit e890df7

To align with the upstream SHA in sdk-zephyr west.yml file used during the latest upmerge. Signed-off-by: Robert Lubos <[email protected]>
rlubos · Oct 22, 2024 · 720fa02 · 720fa02
2 parents 29646ac + e890df7
commit 720fa02
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/boot/bootutil/include/bootutil/crypto/aes_ctr.h b/boot/bootutil/include/bootutil/crypto/aes_ctr.h
@@ -87,9 +87,7 @@ static inline void bootutil_aes_ctr_init(bootutil_aes_ctr_context *ctx)
 
 static inline void bootutil_aes_ctr_drop(bootutil_aes_ctr_context *ctx)
 {
-    /* XXX: config defines MBEDTLS_PLATFORM_NO_STD_FUNCTIONS so no need to free */
-    /* (void)mbedtls_aes_free(ctx); */
-    (void)ctx;
+    mbedtls_aes_free(ctx);
 }
 
 static inline int bootutil_aes_ctr_set_key(bootutil_aes_ctr_context *ctx, const uint8_t *k)

diff --git a/boot/bootutil/include/bootutil/crypto/aes_kw.h b/boot/bootutil/include/bootutil/crypto/aes_kw.h
@@ -45,9 +45,7 @@ static inline void bootutil_aes_kw_init(bootutil_aes_kw_context *ctx)
 
 static inline void bootutil_aes_kw_drop(bootutil_aes_kw_context *ctx)
 {
-    /* XXX: config defines MBEDTLS_PLATFORM_NO_STD_FUNCTIONS so no need to free */
-    /* (void)mbedtls_aes_free(ctx); */
-    (void)ctx;
+    mbedtls_nist_kw_free(ctx);
 }
 
 static inline int bootutil_aes_kw_set_unwrap_key(bootutil_aes_kw_context *ctx, const uint8_t *k, uint32_t klen)

diff --git a/boot/bootutil/include/bootutil/crypto/sha.h b/boot/bootutil/include/bootutil/crypto/sha.h
@@ -134,9 +134,7 @@ static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 
 static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
-    /* XXX: config defines MBEDTLS_PLATFORM_NO_STD_FUNCTIONS so no need to free */
-    /* (void)mbedtls_sha256_free(ctx); */
-    (void)ctx;
+    mbedtls_sha256_free(ctx);
     return 0;
 }
 

diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
@@ -748,6 +748,12 @@ config BOOT_USB_DFU_DETECT_DELAY
 
 endif # BOOT_USB_DFU_GPIO
 
+config BOOT_USB_DFU_NO_APPLICATION
+	bool "Stay in bootloader if no application"
+	help
+	  Allows for entering USB DFU recovery mode if there is no bootable
+	  application that the bootloader can jump to.
+
 config BOOT_USE_BENCH
         bool "Enable benchmark code"
         default n

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
@@ -566,6 +566,14 @@ int main(void)
          * recovery mode
          */
         boot_serial_enter();
+#elif defined(CONFIG_BOOT_USB_DFU_NO_APPLICATION)
+        rc = usb_enable(NULL);
+        if (rc && rc != -EALREADY) {
+            BOOT_LOG_ERR("Cannot enable USB");
+        } else {
+            BOOT_LOG_INF("Waiting for USB DFU");
+            wait_for_usb_dfu(K_FOREVER);
+        }
 #endif
 
         FIH_PANIC;

diff --git a/boot/zephyr/socs/esp32c2.conf b/boot/zephyr/socs/esp32c2.conf
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=512
+CONFIG_BOOT_UPGRADE_ONLY=y
+CONFIG_BOOT_VALIDATE_SLOT0=n
+CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
+CONFIG_BOOT_BANNER=n
+
+CONFIG_UART_CONSOLE=n
+CONFIG_CONSOLE=n
+CONFIG_SERIAL=n
+
+CONFIG_MCUBOOT_LOG_LEVEL_OFF=y
+CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_DEBUG=n
+
+CONFIG_XIP=n
+CONFIG_HEAP_MEM_POOL_SIZE=4096
+CONFIG_MINIMAL_LIBC=y