From 323b35af587bb02b2883be696725affa028f12b0 Mon Sep 17 00:00:00 2001 From: Jiacheng Guo Date: Thu, 3 Mar 2022 15:09:52 +0800 Subject: [PATCH] openthread: Update OpenThread submodule * Remove log region macros and move to the new OpenThread logging module * Remove TREL support --- components/ieee802154/lib | 2 +- components/openthread/Kconfig | 7 ------- components/openthread/lib | 2 +- components/openthread/openthread | 2 +- .../openthread-core-esp32x-ftd-config.h | 16 +--------------- .../openthread-core-esp32x-mtd-config.h | 16 +--------------- .../openthread-core-esp32x-radio-config.h | 16 +--------------- 7 files changed, 6 insertions(+), 55 deletions(-) diff --git a/components/ieee802154/lib b/components/ieee802154/lib index 5545eb14d1..421959af53 160000 --- a/components/ieee802154/lib +++ b/components/ieee802154/lib @@ -1 +1 @@ -Subproject commit 5545eb14d1117a7865a05a6b4a0f19c62760f8c7 +Subproject commit 421959af53886f3130113467718ec9924b518344 diff --git a/components/openthread/Kconfig b/components/openthread/Kconfig index 5a323f3a02..4a21926fe5 100644 --- a/components/openthread/Kconfig +++ b/components/openthread/Kconfig @@ -92,13 +92,6 @@ menu "OpenThread" help Select this option to enable border router features in OpenThread. - config OPENTHREAD_TREL - bool "Enable Thread Radio Encapsulation Link" - depends on OPENTHREAD_BORDER_ROUTER - default n - help - Select this option to enable sending 15.4 frames through the backbone interface. - config OPENTHREAD_ESP_LIB_FROM_INTERNAL_SRC bool "Build esp_openthread libraries from source" depends on OPENTHREAD_ENABLED diff --git a/components/openthread/lib b/components/openthread/lib index 901353a8c1..bb1ecdd49b 160000 --- a/components/openthread/lib +++ b/components/openthread/lib @@ -1 +1 @@ -Subproject commit 901353a8c17d5c3040b3850d571550b0472b921b +Subproject commit bb1ecdd49b50d59b6b0202bfa183679c83336c10 diff --git a/components/openthread/openthread b/components/openthread/openthread index 5eeea0993e..417b5645be 160000 --- a/components/openthread/openthread +++ b/components/openthread/openthread @@ -1 +1 @@ -Subproject commit 5eeea0993e1c1a48ff3c60906c5b628f12e87137 +Subproject commit 417b5645beac21f1b4b32f338e01b9a6fd303d63 diff --git a/components/openthread/private_include/openthread-core-esp32x-ftd-config.h b/components/openthread/private_include/openthread-core-esp32x-ftd-config.h index 772f6d2df8..01308a9063 100644 --- a/components/openthread/private_include/openthread-core-esp32x-ftd-config.h +++ b/components/openthread/private_include/openthread-core-esp32x-ftd-config.h @@ -58,21 +58,7 @@ */ #define OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE 1 -#define OPENTHREAD_CONFIG_LOG_API 1 -#define OPENTHREAD_CONFIG_LOG_ARP 1 -#define OPENTHREAD_CONFIG_LOG_BBR 1 #define OPENTHREAD_CONFIG_LOG_CLI 1 -#define OPENTHREAD_CONFIG_LOG_COAP 1 -#define OPENTHREAD_CONFIG_LOG_DUA 1 -#define OPENTHREAD_CONFIG_LOG_ICMP 1 -#define OPENTHREAD_CONFIG_LOG_IP6 1 -#define OPENTHREAD_CONFIG_LOG_MAC 1 -#define OPENTHREAD_CONFIG_LOG_MEM 1 -#define OPENTHREAD_CONFIG_LOG_MESHCOP 1 -#define OPENTHREAD_CONFIG_LOG_MLE 1 -#define OPENTHREAD_CONFIG_LOG_MLR 1 -#define OPENTHREAD_CONFIG_LOG_NETDATA 1 -#define OPENTHREAD_CONFIG_LOG_NETDIAG 1 #define OPENTHREAD_CONFIG_LOG_PKT_DUMP 1 #define OPENTHREAD_CONFIG_LOG_PLATFORM 1 @@ -201,7 +187,7 @@ * */ #ifndef OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE -#define OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE CONFIG_OPENTHREAD_TREL +#define OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE 0 #endif /** diff --git a/components/openthread/private_include/openthread-core-esp32x-mtd-config.h b/components/openthread/private_include/openthread-core-esp32x-mtd-config.h index 63499691bd..f2131e46e6 100644 --- a/components/openthread/private_include/openthread-core-esp32x-mtd-config.h +++ b/components/openthread/private_include/openthread-core-esp32x-mtd-config.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -58,21 +58,7 @@ */ #define OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE 1 -#define OPENTHREAD_CONFIG_LOG_API 1 -#define OPENTHREAD_CONFIG_LOG_ARP 1 -#define OPENTHREAD_CONFIG_LOG_BBR 1 #define OPENTHREAD_CONFIG_LOG_CLI 1 -#define OPENTHREAD_CONFIG_LOG_COAP 1 -#define OPENTHREAD_CONFIG_LOG_DUA 1 -#define OPENTHREAD_CONFIG_LOG_ICMP 1 -#define OPENTHREAD_CONFIG_LOG_IP6 1 -#define OPENTHREAD_CONFIG_LOG_MAC 1 -#define OPENTHREAD_CONFIG_LOG_MEM 1 -#define OPENTHREAD_CONFIG_LOG_MESHCOP 1 -#define OPENTHREAD_CONFIG_LOG_MLE 1 -#define OPENTHREAD_CONFIG_LOG_MLR 1 -#define OPENTHREAD_CONFIG_LOG_NETDATA 1 -#define OPENTHREAD_CONFIG_LOG_NETDIAG 1 #define OPENTHREAD_CONFIG_LOG_PKT_DUMP 1 #define OPENTHREAD_CONFIG_LOG_PLATFORM 1 diff --git a/components/openthread/private_include/openthread-core-esp32x-radio-config.h b/components/openthread/private_include/openthread-core-esp32x-radio-config.h index a87f172611..5b742b5fb5 100644 --- a/components/openthread/private_include/openthread-core-esp32x-radio-config.h +++ b/components/openthread/private_include/openthread-core-esp32x-radio-config.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -63,21 +63,7 @@ #endif #endif -#define OPENTHREAD_CONFIG_LOG_API 1 -#define OPENTHREAD_CONFIG_LOG_ARP 1 -#define OPENTHREAD_CONFIG_LOG_BBR 1 #define OPENTHREAD_CONFIG_LOG_CLI 1 -#define OPENTHREAD_CONFIG_LOG_COAP 1 -#define OPENTHREAD_CONFIG_LOG_DUA 1 -#define OPENTHREAD_CONFIG_LOG_ICMP 1 -#define OPENTHREAD_CONFIG_LOG_IP6 1 -#define OPENTHREAD_CONFIG_LOG_MAC 1 -#define OPENTHREAD_CONFIG_LOG_MEM 1 -#define OPENTHREAD_CONFIG_LOG_MESHCOP 1 -#define OPENTHREAD_CONFIG_LOG_MLE 1 -#define OPENTHREAD_CONFIG_LOG_MLR 1 -#define OPENTHREAD_CONFIG_LOG_NETDATA 1 -#define OPENTHREAD_CONFIG_LOG_NETDIAG 1 #define OPENTHREAD_CONFIG_LOG_PKT_DUMP 1 #define OPENTHREAD_CONFIG_LOG_PLATFORM 1