Merge branch 'backport5.2/ot_examples_config' into 'release/v5.2'

fix(openthread): openthread examples config (backport v5.2) See merge request espressif/esp-idf!27554
espressif · Dec 3, 2023 · 3c43fb0 · 3c43fb0
2 parents 60e439d + 4f33ef4
commit 3c43fb0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 23 deletions.
diff --git 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,

diff --git 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
@@ -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
@@ -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
@@ -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