Merge branch 'pr_130' into 'main'

feat(rcp_update): use esp serial flasher 1.8.0 and support esp32c6

See merge request espressif/esp-thread-br!159

Author: chshu

components/esp_rcp_update/idf_component.yml

@@ -1,9 +1,9 @@
-version: "1.3.1"
+version: "1.4.0"
 description: Espressif RCP Update Component for Thread Border Router and Zigbee Gateway
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_rcp_update
 dependencies:
   espressif/esp-serial-flasher:
-    version: "~0.0.0"
+    version: "1.8.0"
 
   idf:
     version: ">=5.0"

components/esp_rcp_update/include/esp_rcp_update.h

@@ -18,10 +18,15 @@ extern "C" {
 #define RCP_URL_MAX_SIZE 100
 
 typedef enum {
-    RCP_TYPE_INVALID = 0,  /* Invalid type */
-    RCP_TYPE_ESP32H2_UART, /* ESP32H2 connected via UART */
+    RCP_TYPE_INVALID = 0, /* Invalid type */
+    RCP_TYPE_UART = 1,    /* Connected via UART */
+    RCP_TYPE_MAX = 2,     /* Max type */
 } esp_rcp_type_t;
 
+/* For compatibility, will be removed in the next major update. */
+#define RCP_TYPE_ESP32H2_UART \
+    _Pragma("GCC warning \"'RCP_TYPE_ESP32H2_UART' enum is deprecated, use 'RCP_TYPE_UART' instead\"") RCP_TYPE_UART
+
 /**
  * @brief The RCP update config for OpenThread.
  *

components/esp_rcp_update/src/esp_rcp_update.c

@@ -207,8 +207,8 @@ esp_err_t esp_rcp_submit_new_image()
 esp_err_t esp_rcp_update_init(const esp_rcp_update_config_t *update_config)
 {
     ESP_RETURN_ON_ERROR(nvs_open("storage", NVS_READWRITE, &s_handle.nvs_handle), "TAG", "Failed to open nvs");
-    ESP_RETURN_ON_FALSE(update_config->rcp_type == RCP_TYPE_ESP32H2_UART, ESP_ERR_INVALID_ARG, TAG,
-                        "Unsupported RCP type");
+    ESP_RETURN_ON_FALSE(update_config->rcp_type > RCP_TYPE_INVALID && update_config->rcp_type < RCP_TYPE_MAX,
+                        ESP_ERR_INVALID_ARG, TAG, "Unsupported RCP type");
 
     s_handle.update_config = *update_config;
     load_rcp_update_seq(&s_handle);

examples/basic_thread_border_router/main/esp_ot_config.h

@@ -72,12 +72,12 @@
 #endif // CONFIG_OPENTHREAD_RADIO_SPINEL_UART OR  CONFIG_OPENTHREAD_RADIO_SPINEL_SPI
 
 #if CONFIG_AUTO_UPDATE_RCP
-#define ESP_OPENTHREAD_RCP_UPDATE_CONFIG()                                                                           \
-    {                                                                                                                \
-        .rcp_type = RCP_TYPE_ESP32H2_UART, .uart_rx_pin = CONFIG_PIN_TO_RCP_TX, .uart_tx_pin = CONFIG_PIN_TO_RCP_RX, \
-        .uart_port = 1, .uart_baudrate = 115200, .reset_pin = CONFIG_PIN_TO_RCP_RESET,                               \
-        .boot_pin = CONFIG_PIN_TO_RCP_BOOT, .update_baudrate = 460800,                                               \
-        .firmware_dir = "/" CONFIG_RCP_PARTITION_NAME "/ot_rcp", .target_chip = ESP32H2_CHIP,                        \
+#define ESP_OPENTHREAD_RCP_UPDATE_CONFIG()                                                                   \
+    {                                                                                                        \
+        .rcp_type = RCP_TYPE_UART, .uart_rx_pin = CONFIG_PIN_TO_RCP_TX, .uart_tx_pin = CONFIG_PIN_TO_RCP_RX, \
+        .uart_port = 1, .uart_baudrate = 115200, .reset_pin = CONFIG_PIN_TO_RCP_RESET,                       \
+        .boot_pin = CONFIG_PIN_TO_RCP_BOOT, .update_baudrate = 460800,                                       \
+        .firmware_dir = "/" CONFIG_RCP_PARTITION_NAME "/ot_rcp", .target_chip = ESP32H2_CHIP,                \
     }
 #else
 #define ESP_OPENTHREAD_RCP_UPDATE_CONFIG() \

examples/basic_thread_border_router/main/idf_component.yml

@@ -4,7 +4,7 @@ dependencies:
   espressif/esp_ot_cli_extension:
     version: "~1.2.0"
   espressif/esp_rcp_update:
-    version: "~1.3.0"
+    version: "~1.4.0"
   esp_br_http_ota:
     path: ../../../components/esp_br_http_ota
   esp_ot_br_server:

tools/ci/idf_component_local.yml

@@ -5,7 +5,6 @@ dependencies:
     path: ${ESP_THREAD_BR_PATH}/components/esp_ot_cli_extension
   espressif/esp_rcp_update:
     path: ${ESP_THREAD_BR_PATH}/components/esp_rcp_update
-  espressif/esp-serial-flasher: "~0.0.0"
   esp_br_http_ota:
     path: ${ESP_THREAD_BR_PATH}/components/esp_br_http_ota
   esp_ot_br_server: