From c9babf8cb311bb3d58805a302b6fde89f2b0d2e5 Mon Sep 17 00:00:00 2001 From: Shu Chen Date: Wed, 15 Nov 2023 20:17:53 +0800 Subject: [PATCH 1/2] fix(openthread): remove invalid configs from ot examples --- examples/openthread/ot_br/sdkconfig.defaults | 8 -------- examples/openthread/ot_cli/sdkconfig.defaults | 6 ------ examples/openthread/ot_rcp/sdkconfig.defaults | 6 ------ .../ot_sleepy_device/deep_sleep/sdkconfig.defaults | 2 -- 4 files changed, 22 deletions(-) diff --git a/examples/openthread/ot_br/sdkconfig.defaults b/examples/openthread/ot_br/sdkconfig.defaults index d2ee6928f0..c223da9ab8 100644 --- a/examples/openthread/ot_br/sdkconfig.defaults +++ b/examples/openthread/ot_br/sdkconfig.defaults @@ -1,9 +1,3 @@ -# -# libsodium -# -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of libsodium - # # Partition Table # @@ -30,7 +24,6 @@ CONFIG_MBEDTLS_ECJPAKE_C=y # CONFIG_OPENTHREAD_ENABLED=y CONFIG_OPENTHREAD_BORDER_ROUTER=y -CONFIG_OPENTHREAD_TREL=y # end of OpenThread # @@ -50,7 +43,6 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=y # # mDNS # -CONFIG_MDNS_STRICT_MODE=y CONFIG_MDNS_MULTIPLE_INSTANCE=y # end of mDNS diff --git a/examples/openthread/ot_cli/sdkconfig.defaults b/examples/openthread/ot_cli/sdkconfig.defaults index b998de8176..3e302126d3 100644 --- a/examples/openthread/ot_cli/sdkconfig.defaults +++ b/examples/openthread/ot_cli/sdkconfig.defaults @@ -1,9 +1,3 @@ -# -# libsodium -# -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of libsodium - # # Partition Table # diff --git a/examples/openthread/ot_rcp/sdkconfig.defaults b/examples/openthread/ot_rcp/sdkconfig.defaults index cc6c671d8e..9447d6bf5d 100644 --- a/examples/openthread/ot_rcp/sdkconfig.defaults +++ b/examples/openthread/ot_rcp/sdkconfig.defaults @@ -1,9 +1,3 @@ -# -# libsodium -# -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of libsodium - # # Partition Table # diff --git a/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults b/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults index 00774aa81d..ffd005ecd7 100644 --- a/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults +++ b/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults @@ -45,8 +45,6 @@ CONFIG_IEEE802154_ENABLED=y # # deep sleep # -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80 CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_RESERVE_MEM=512 CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y From d13e47596b7e92f8a8cf5d469a3037248d6f7131 Mon Sep 17 00:00:00 2001 From: Xu Si Yu Date: Thu, 23 Nov 2023 19:54:30 +0800 Subject: [PATCH 2/2] fix(openthread): add eventfd nums for spi interface --- examples/openthread/ot_br/main/esp_ot_br.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/openthread/ot_br/main/esp_ot_br.c b/examples/openthread/ot_br/main/esp_ot_br.c index f0b31fa0b0..18dea1cec4 100644 --- a/examples/openthread/ot_br/main/esp_ot_br.c +++ b/examples/openthread/ot_br/main/esp_ot_br.c @@ -105,8 +105,10 @@ void app_main(void) // * task queue // * border router esp_vfs_eventfd_config_t eventfd_config = { -#if CONFIG_OPENTHREAD_RADIO_NATIVE +#if CONFIG_OPENTHREAD_RADIO_NATIVE || CONFIG_OPENTHREAD_RADIO_SPINEL_SPI // * radio driver (A native radio device needs a eventfd for radio driver.) + // * SpiSpinelInterface (The Spi Spinel Interface needs a eventfd.) + // The above will not exist at the same time. .max_fds = 4, #else .max_fds = 3,