From adb19e970527970f4e5badc9e0d7efe003d45884 Mon Sep 17 00:00:00 2001
From: liquidraver <504870+liquidraver@users.noreply.github.com>
Date: Tue, 24 Mar 2026 08:56:41 +0100
Subject: [PATCH] west update - one manual patch is not obsolete

---
 zephcore/CMakeLists.txt                       | 13 -------
 .../espressif/0001-mcuboot-config.patch       | 37 -------------------
 zephcore/west.yml                             |  4 +-
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 zephcore/patches/espressif/0001-mcuboot-config.patch

diff --git a/zephcore/CMakeLists.txt b/zephcore/CMakeLists.txt
index c445d83..3ad6d1e 100644
--- a/zephcore/CMakeLists.txt
+++ b/zephcore/CMakeLists.txt
@@ -14,7 +14,6 @@ cmake_minimum_required(VERSION 3.20.0)
 # Directory layout:
 #   patches/zephyr/*.patch       - unified diffs applied to the Zephyr tree
 #   patches/zephyr-new/          - new files copied to the Zephyr tree (no upstream)
-#   patches/espressif/*.patch    - unified diffs for modules/hal/espressif
 #
 # Zephyr patches:
 #   0001-lora-lr11xx-build       - CMakeLists.txt + Kconfig (lr11xx subdirectory)
@@ -26,8 +25,6 @@ cmake_minimum_required(VERSION 3.20.0)
 #   drivers/lora/lr11xx/*        - LR11xx Zephyr LoRa driver
 #   drivers/lora/native/sx126x/sx126x_ext.h - SX126x extension API header
 #   dts/bindings/lora/semtech,lr1110.yaml - LR1110 DTS binding
-# Module patches:
-#   espressif: MCUboot config flexibility (mbedtls, validation, sector count)
 #
 
 # --- Helper: apply unified diff patches via git apply ---
@@ -162,16 +159,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/patches/zephyr-new)
     endforeach()
 endif()
 
-# Apply unified diff patches to espressif module
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/patches/espressif)
-    message(STATUS "Applying ZephCore patches to espressif...")
-    zephcore_apply_patches(
-        "${CMAKE_CURRENT_SOURCE_DIR}/patches/espressif"
-        "${MODULES_DIR}/hal/espressif"
-        "espressif"
-    )
-endif()
-
 # Add custom boards directory (for Wio Tracker L1, etc.)
 # Zephyr expects: <BOARD_ROOT>/boards/<vendor>/<board>/
 # Our structure: zephcore/boards/<mcu>/<board>/
diff --git a/zephcore/patches/espressif/0001-mcuboot-config.patch b/zephcore/patches/espressif/0001-mcuboot-config.patch
deleted file mode 100644
index 1733412..0000000
--- a/zephcore/patches/espressif/0001-mcuboot-config.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h b/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
-index 07aab9d15b..1338dedfdf 100644
---- a/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
-+++ b/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
-@@ -2,6 +2,9 @@
-  * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
-  *
-  * SPDX-License-Identifier: Apache-2.0
-+ *
-+ * ZephCore patch: fixed mbedTLS detection (also check CONFIG_BOOT_USE_MBEDTLS),
-+ * and made MCUBOOT_VALIDATE_PRIMARY_SLOT conditional on Kconfig.
-  */
- 
- #ifndef __MCUBOOT_CONFIG_H__
-@@ -76,8 +79,8 @@
-  * available.
-  */
- 
--/* Uncomment to use Mbed TLS cryptographic primitives */
--#if defined(CONFIG_ESP_USE_MBEDTLS)
-+/* ZephCore patch: also check CONFIG_BOOT_USE_MBEDTLS (Zephyr Kconfig) */
-+#if defined(CONFIG_ESP_USE_MBEDTLS) || defined(CONFIG_BOOT_USE_MBEDTLS)
- #define MCUBOOT_USE_MBED_TLS
- #else
- /* MCUboot requires the definition of a crypto lib,
-@@ -90,7 +93,11 @@
-  * even if no upgrade was performed. This is recommended if the boot
-  * time penalty is acceptable.
-  */
-+/* ZephCore patch: honor Kconfig CONFIG_BOOT_VALIDATE_SLOT0 instead of
-+ * always validating. When unset, skip per-boot validation for faster boot. */
-+#if !defined(CONFIG_BOOT_VALIDATE_SLOT0) || CONFIG_BOOT_VALIDATE_SLOT0
- #define MCUBOOT_VALIDATE_PRIMARY_SLOT
-+#endif
- 
- #ifdef CONFIG_ESP_DOWNGRADE_PREVENTION
- #define MCUBOOT_DOWNGRADE_PREVENTION 1
diff --git a/zephcore/west.yml b/zephcore/west.yml
index 2526020..ef1464b 100644
--- a/zephcore/west.yml
+++ b/zephcore/west.yml
@@ -6,11 +6,11 @@ manifest:
   projects:
     - name: hal_espressif
       remote: zephyrproject-rtos
-      revision: e994fd973c2d8eab1ed2c8278c04e841b3a5217a
+      revision: cbf74978350266a45edbfb4508553a3990341dd2
       path: modules/hal/espressif
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: 56f8a30c7fd7521e5eeab186b2f425f295376905
+      revision: b104f826ca8e3a85cb205d2962189287f59d3174
       import: true
 
   self: