Merge branch 'espressif:release/v5.4' into release/v5.4

Author: Jason2866

.gitlab/ci/build.yml

@@ -237,7 +237,7 @@ pytest_build_system_macos:
     PYENV_VERSION: "3.8"
     # CCACHE_DIR: "/cache/idf_ccache". On macOS, you cannot write to this folder due to insufficient permissions.
     CCACHE_DIR: "" # ccache will use "$HOME/Library/Caches/ccache".
-    CCACHE_MAXSIZE: "5G" # To preserve the limited Macbook storage. CCACHE automatically prunes old caches to fit the set limit.
+
 build_docker:
   extends:
     - .before_script:minimal

components/bt/host/bluedroid/btc/profile/std/avrc/btc_avrc.c

@@ -1673,9 +1673,11 @@ void btc_avrc_get_profile_status(esp_avrc_profile_status_t *param)
         if (btc_avrc_ct_init_p()) {
             param->avrc_ct_inited = true;
         }
+#if BTC_AV_CA_INCLUDED
         if (btc_rc_cb.rc_cover_art_connected) {
             param->ct_cover_art_conn_num++;
         }
+#endif
     }
 }
 

components/esp-tls/Kconfig

@@ -114,4 +114,12 @@ menu "ESP-TLS"
             Enable a fuller set of OCSP checks: checking revocation status of intermediate certificates,
             optional fallbacks to CRLs, etc.
 
+    config ESP_TLS_DYN_BUF_STRATEGY_SUPPORTED
+        bool
+        default y
+        help
+            Enable support for dynamic buffer strategy for ESP-TLS. This is the hidden config option kept
+            for external components like OTA, to find out whether the dynamic buffer strategy is supported
+            for particular ESP-IDF version.
+
 endmenu

components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld

@@ -129,7 +129,7 @@ s_trans_id = 0x3fcdfac4;
  ***************************************/
 
 /* Functions */
-coex_core_event_duration_get = 0x40002178;
+/* coex_core_event_duration_get = 0x40002178; */
 /* coex_core_timer_idx_get = 0x4000218c; */
 coex_hw_timer_tick_get = 0x400021b8;
 

components/openthread/include/esp_openthread_netif_glue.h

@@ -76,6 +76,17 @@ esp_netif_t *esp_openthread_get_netif(void);
  */
 void esp_openthread_register_meshcop_e_handler(esp_event_handler_t handler, bool for_publish);
 
+/**
+ * @brief This function judges the target address is openthread mesh local or not.
+ *
+ * @param[in]    address   The address.
+ *
+ * @return
+ *      - True if the address is openthread mesh local, otherwise false
+ *
+ */
+bool is_openthread_internal_mesh_local_addr(const otIp6Address *address);
+
 #ifdef __cplusplus
 }
 #endif

components/openthread/lib

@@ -36,17 +36,6 @@ void esp_openthread_netif_glue_update(esp_openthread_mainloop_context_t *mainloo
  */
 esp_err_t esp_openthread_netif_glue_process(otInstance *instance, const esp_openthread_mainloop_context_t *mainloop);
 
-/**
- * @brief This function judges the target address is openthread mesh local or not.
- *
- * @param[in]    address   The address.
- *
- * @return
- *      - True if the address is openthread mesh local, otherwise false
- *
- */
-bool is_openthread_internal_mesh_local_addr(const otIp6Address *address);
-
 #ifdef __cplusplus
 }
 #endif

components/openthread/private_include/esp_openthread_netif_glue_priv.h

@@ -0,0 +1,12 @@
+# Override some defaults so BT stack is enabled and
+# Classic BT is enabled and BT_DRAM_RELEASE is disabled
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=y
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=y
+CONFIG_BT_AVRCP_CT_COVER_ART_ENABLED=n
+CONFIG_EXAMPLE_AVRCP_CT_COVER_ART_ENABLE=n
+CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=n

examples/bluetooth/bluedroid/classic_bt/a2dp_sink/sdkconfig.ci.ca_dis

@@ -9,7 +9,7 @@ CONFIG_ESP_WIFI_TX_BA_WIN=16
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=14
 
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11520
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=7200
 CONFIG_LWIP_TCP_WND_DEFAULT=11520
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=32
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=32

examples/wifi/iperf/sdkconfig.defaults.esp32c2

@@ -9,7 +9,7 @@ CONFIG_ESP_WIFI_TX_BA_WIN=16
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=16
 
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=28000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=17280
 CONFIG_LWIP_TCP_WND_DEFAULT=28000
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=32
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=32