Merge branch 'feature/upgrade_idf_version' into 'master'

feat: update at core version to 39714972 See merge request application/esp-at!1468
espressif · Nov 22, 2023 · 603e5e8 · 603e5e8
2 parents b9d9403 + 1c6d3fb
commit 603e5e8
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 17 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -334,6 +334,7 @@ esp32c3_at_full_function_test:
     - export MODULE_CFG_DIR=module_esp32c3_default
     - 'echo -e "{\"platform\": \"PLATFORM_ESP32C3\", \"module\": \"MINI-1\", \"description\": \"\",\"silence\": 0}" > module_info.json'
     - *execute_script_esp32c3
+  when: manual
 
 esp32c3_spi_at:
   extends:

diff --git a/components/at/lib/VERSION b/components/at/lib/VERSION
@@ -1,4 +1,4 @@
-ESP32:   7d28df1
-ESP32C3: 7d28df1
-ESP32C2: 7d28df1
-ESP32C6: 7d28df1
+ESP32:   3971497
+ESP32C3: 3971497
+ESP32C2: 3971497
+ESP32C6: 3971497
diff --git a/components/at/lib/libesp32_at_core.a b/components/at/lib/libesp32_at_core.a
diff --git a/components/at/lib/libesp32_at_core_silence.a b/components/at/lib/libesp32_at_core_silence.a
diff --git a/components/at/lib/libesp32c2_at_core.a b/components/at/lib/libesp32c2_at_core.a
diff --git a/components/at/lib/libesp32c2_at_core_silence.a b/components/at/lib/libesp32c2_at_core_silence.a
diff --git a/components/at/lib/libesp32c3_at_core.a b/components/at/lib/libesp32c3_at_core.a
diff --git a/components/at/lib/libesp32c3_at_core_silence.a b/components/at/lib/libesp32c3_at_core_silence.a
diff --git a/components/at/lib/libesp32c6_at_core.a b/components/at/lib/libesp32c6_at_core.a
diff --git a/components/at/lib/libesp32c6_at_core_silence.a b/components/at/lib/libesp32c6_at_core_silence.a
diff --git a/module_config/module_esp32-d2wd/IDF_VERSION b/module_config/module_esp32-d2wd/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32-sdio/IDF_VERSION b/module_config/module_esp32-sdio/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32_default/IDF_VERSION b/module_config/module_esp32_default/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c2-2mb/IDF_VERSION b/module_config/module_esp32c2-2mb/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c2_default/IDF_VERSION b/module_config/module_esp32c2_default/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c3-spi/IDF_VERSION b/module_config/module_esp32c3-spi/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c3_default/IDF_VERSION b/module_config/module_esp32c3_default/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c3_rainmaker/IDF_VERSION b/module_config/module_esp32c3_rainmaker/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32c6_default/IDF_VERSION b/module_config/module_esp32c6_default/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.1
-commit:e088c3766ba440e72268b458a68f27b6e7d63986
+commit:482a8fb2d78e3b58eb21b26da8a5bedf90623213
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_wrover-32/IDF_VERSION b/module_config/module_wrover-32/IDF_VERSION
@@ -1,3 +1,3 @@
 branch:release/v5.0
-commit:24b9d38a24e354102b524d70c0f112a799aee9f7
+commit:8fbf4ba6058bcf736317d8a7aa75d0578563c38b
 repository:https://github.com/espressif/esp-idf.git
diff --git a/tools/relink/function.csv b/tools/relink/function.csv
@@ -109,7 +109,7 @@ libesp_timer.a,esp_timer.c.obj,esp_timer_start_periodic,
 libesp_timer.a,esp_timer.c.obj,esp_timer_stop,
 libesp_timer.a,esp_timer.c.obj,esp_timer_get_expiry_time,
 libesp_timer.a,esp_timer_impl_systimer.c.obj,esp_timer_impl_update_apb_freq,
-libesp_timer.a,esp_timer_impl_systimer.c.obj,esp_timer_impl_get_min_period_us,
+libesp_timer.a,esp_timer_impl_common.c.obj,esp_timer_impl_get_min_period_us,
 libesp_timer.a,ets_timer_legacy.c.obj,timer_initialized,
 libesp_timer.a,ets_timer_legacy.c.obj,ets_timer_arm_us,
 libesp_timer.a,ets_timer_legacy.c.obj,ets_timer_arm,
@@ -152,7 +152,6 @@ libfreertos.a,port.c.obj,vPortYieldOtherCore,FALSE
 libfreertos.a,port.c.obj,vPortYield,
 libfreertos.a,port_common.c.obj,xPortcheckValidStackMem,
 libfreertos.a,port_common.c.obj,vApplicationGetTimerTaskMemory,
-libfreertos.a,port_common.c.obj,esp_startup_start_app_common,
 libfreertos.a,port_common.c.obj,xPortCheckValidTCBMem,
 libfreertos.a,port_common.c.obj,vApplicationGetIdleTaskMemory,
 libfreertos.a,port_systick.c.obj,vPortSetupTimer,

diff --git a/tools/relink/object.csv b/tools/relink/object.csv
@@ -38,12 +38,13 @@ libesp_system.a,reset_reason.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_syste
 libesp_system.a,ubsan.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/ubsan.c.obj
 libesp_timer.a,esp_timer.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/esp_timer.c.obj
 libesp_timer.a,esp_timer_impl_systimer.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/esp_timer_impl_systimer.c.obj
+libesp_timer.a,esp_timer_impl_common.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/esp_timer_impl_common.c.obj
 libesp_timer.a,ets_timer_legacy.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/ets_timer_legacy.c.obj
 libesp_timer.a,system_time.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/system_time.c.obj
 libesp_wifi.a,esp_adapter.c.obj,esp-idf/esp_wifi/CMakeFiles/__idf_esp_wifi.dir/esp32c2/esp_adapter.c.obj
 libfreertos.a,list.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/list.c.obj
 libfreertos.a,port.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/riscv/port.c.obj
-libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_common.c.obj
+libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_common.c.obj
 libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_systick.c.obj
 libfreertos.a,queue.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/queue.c.obj
 libfreertos.a,tasks.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/tasks.c.obj