Merge branch 'bugfix/fix_the_br_ethernet_dependency' into 'main'

fix(br): fix the ethernet connection issue See merge request espressif/esp-thread-br!137
espressif · Aug 28, 2024 · 6011f07 · 6011f07
2 parents 5f29e7d + dbd171f
commit 6011f07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/components/esp_ot_cli_extension/CMakeLists.txt b/components/esp_ot_cli_extension/CMakeLists.txt
@@ -33,7 +33,7 @@ if(CONFIG_OPENTHREAD_CLI_WIFI)
 endif()
 idf_component_register(SRCS "${srcs}"
  INCLUDE_DIRS "${include}"
- PRIV_REQUIRES lwip openthread iperf esp_netif esp_wifi http_parser esp_http_client esp_coex heap mbedtls nvs_flash)
+ PRIV_REQUIRES lwip openthread iperf esp_netif esp_wifi http_parser esp_http_client esp_coex heap mbedtls nvs_flash esp_eth)
 
 if (CONFIG_OPENTHREAD_CLI_OTA)
  idf_component_optional_requires(PUBLIC esp_br_http_ota)

diff --git a/components/esp_ot_cli_extension/Kconfig b/components/esp_ot_cli_extension/Kconfig
@@ -9,7 +9,7 @@ menu "OpenThread Extension CLI"
 
  config OPENTHREAD_CLI_WIFI
  bool "Enable wifi connection command"
- depends on OPENTHREAD_CLI_ESP_EXTENSION && OPENTHREAD_BORDER_ROUTER
+ depends on OPENTHREAD_CLI_ESP_EXTENSION && OPENTHREAD_BORDER_ROUTER && EXAMPLE_CONNECT_WIFI
  default y if ESP_WIFI_ENABLED
 
  config OPENTHREAD_CLI_OTA

diff --git a/components/esp_ot_cli_extension/idf_component.yml b/components/esp_ot_cli_extension/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "1.2.1"
 description: Espressif OpenThread CLI Extension
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_ot_cli_extension
 dependencies:

diff --git a/examples/common/thread_border_router/src/border_router_launch.c b/examples/common/thread_border_router/src/border_router_launch.c
@@ -43,6 +43,7 @@
 
 #if CONFIG_OPENTHREAD_BR_AUTO_START
 #include "esp_wifi.h"
+#include "example_common_private.h"
 #include "protocol_examples_common.h"
 #endif
 
@@ -137,7 +138,9 @@ static void ot_br_init(void *ctx)
  esp_openthread_lock_acquire(portMAX_DELAY);
  esp_openthread_set_backbone_netif(get_example_netif());
  ESP_ERROR_CHECK(esp_openthread_border_router_init());
+#if CONFIG_EXAMPLE_CONNECT_WIFI
  esp_ot_wifi_border_router_init_flag_set(true);
+#endif
  otOperationalDatasetTlvs dataset;
  otError error = otDatasetGetActiveTlvs(esp_openthread_get_instance(), &dataset);
  ESP_ERROR_CHECK(esp_openthread_auto_start((error == OT_ERROR_NONE) ? &dataset : NULL));