From 2a8374245f126431f283f43f72bdf863b1c4e40a Mon Sep 17 00:00:00 2001 From: zwx Date: Fri, 10 Apr 2026 15:18:29 +0800 Subject: [PATCH 1/3] feat(openthread): update openthread upstream --- components/openthread/openthread | 2 +- components/openthread/sbom_openthread.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/openthread/openthread b/components/openthread/openthread index b1a37932b18..a98813b30ae 160000 --- a/components/openthread/openthread +++ b/components/openthread/openthread @@ -1 +1 @@ -Subproject commit b1a37932b1830518f6fa6c92dfb4123a01ac3052 +Subproject commit a98813b30ae58f9a95ece680b9cc46c3874de6ea diff --git a/components/openthread/sbom_openthread.yml b/components/openthread/sbom_openthread.yml index 29346f14305..ea5d2d11e7c 100644 --- a/components/openthread/sbom_openthread.yml +++ b/components/openthread/sbom_openthread.yml @@ -5,4 +5,4 @@ supplier: 'Organization: Espressif Systems (Shanghai) CO LTD' originator: 'Organization: Google LLC' description: OpenThread released by Google is an open-source implementation of the Thread networking url: https://github.com/espressif/openthread -hash: b1a37932b1830518f6fa6c92dfb4123a01ac3052 +hash: a98813b30ae58f9a95ece680b9cc46c3874de6ea From 25e0b1a4484254f1c8cf8a54cd58a296253c0947 Mon Sep 17 00:00:00 2001 From: zwx Date: Tue, 14 Apr 2026 17:13:59 +0800 Subject: [PATCH 2/3] fix(openthread): fix build failure in spinel-only mode --- .../openthread-core-esp32x-spinel-config.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/components/openthread/private_include/openthread-core-esp32x-spinel-config.h b/components/openthread/private_include/openthread-core-esp32x-spinel-config.h index 7c3853ecb56..9e01fb818af 100644 --- a/components/openthread/private_include/openthread-core-esp32x-spinel-config.h +++ b/components/openthread/private_include/openthread-core-esp32x-spinel-config.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -76,3 +76,15 @@ #ifndef OPENTHREAD_SPINEL_CONFIG_COPROCESSOR_RESET_FAILURE_CALLBACK_ENABLE #define OPENTHREAD_SPINEL_CONFIG_COPROCESSOR_RESET_FAILURE_CALLBACK_ENABLE 1 #endif + +/** + * @def OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE + * + * In spinel-only mode no Instance object is compiled or instantiated, so the + * single-instance path (Instance::Get().GetLogLevel()) is unavailable. Enabling + * multiple-instance support forces the logging APIs to use the global log level + * (Instance::GetGlobalLogLevel()), which does not depend on an Instance object. + */ +#ifndef OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE +#define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 1 +#endif From cfc929fed0c63fe711cf542e68847586d3a67af6 Mon Sep 17 00:00:00 2001 From: Zhang Wen Xu Date: Mon, 27 Apr 2026 07:47:33 +0000 Subject: [PATCH 3/3] feat(openthread/openthread/lib): update thread-lib for upstream a98813b30 * esp-openthread: thread_zigbee/esp-openthread@654e8d3b2 * openthread: espressif/openthread@a98813b30 * esp-idf: espressif/esp-idf@25e0b1a44 --- components/openthread/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/openthread/lib b/components/openthread/lib index 1ac8672c63f..b6278394f47 160000 --- a/components/openthread/lib +++ b/components/openthread/lib @@ -1 +1 @@ -Subproject commit 1ac8672c63f33320adfc144695dd8e28ad441e55 +Subproject commit b6278394f47623a37a5246d550cff9305a66fe4b