Merge branch 'espressif:master' into master

Author: cxxfighting

.github/workflows/build_template_esp32c2.yml

@@ -14,7 +14,7 @@ on:
     secrets:
       ESP32C2_4MB_TOKEN:
         required: false
-      ESP32C2_ECO4_4MB_TOKEN:
+      ESP32C2_4MB_G2_TOKEN:
         required: false
       ESP32C2_2MB_TOKEN:
         required: false
@@ -41,8 +41,8 @@ jobs:
         echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_2MB \"${{ secrets.ESP32C2_2MB_TOKEN }}\"" >> at_ota_token.h
         echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB \"${{ secrets.ESP32C2_4MB_TOKEN }}\"" >> at_ota_token.h
         echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB \"${{ secrets.ESP32C2_4MB_TOKEN }}\"" >> at_ota_token.h
-        echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_ECO4_4MB \"${{ secrets.ESP32C2_ECO4_4MB_TOKEN }}\"" >> at_ota_token.h
-        echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_ECO4_4MB \"${{ secrets.ESP32C2_ECO4_4MB_TOKEN }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB_G2 \"${{ secrets.ESP32C2_4MB_G2_TOKEN }}\"" >> at_ota_token.h
+        echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB_G2 \"${{ secrets.ESP32C2_4MB_G2_TOKEN }}\"" >> at_ota_token.h
         cd -
     - name: Install environment variables
       run: |

.github/workflows/main.yml

@@ -101,11 +101,11 @@ jobs:
       artifacts_name: esp32c2-4MB-at
     secrets: inherit
 
-  build-esp32c2-eco4-4mb-at:
+  build-esp32c2-4mb-g2-at:
     uses: ./.github/workflows/build_template_esp32c2.yml
     with:
-      module_name: ESP32C2-ECO4-4MB
-      artifacts_name: esp32c2-eco4-4MB-at
+      module_name: ESP32C2-4MB-G2
+      artifacts_name: esp32c2-4MB-g2-at
     secrets: inherit
 
   build-esp32c2-2mb-at:

.gitlab/ci/build_esp32c2.yml

@@ -14,12 +14,12 @@ esp32c2_4mb_at:
   variables:
     MODULE_NAME: "ESP32C2-4MB"
 
-esp32c2_eco4_4mb_at:
+esp32c2_4mb_g2_at:
   extends:
     - .build_template_esp32c2
     - .rules:build:build_project
   variables:
-    MODULE_NAME: "ESP32C2-ECO4-4MB"
+    MODULE_NAME: "ESP32C2-4MB-G2"
 
 esp32c2_ble_2mb_at:
   extends:

.gitlab/ci/build_template.yml

@@ -84,8 +84,8 @@
   - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_2MB \"$ESP32C2_2MB_TOKEN\"" >> at_ota_token.h
   - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB \"$ESP32C2_4MB_TOKEN\"" >> at_ota_token.h
   - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB \"$ESP32C2_4MB_TOKEN\"" >> at_ota_token.h
-  - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_ECO4_4MB \"$ESP32C2_ECO4_4MB_TOKEN\"" >> at_ota_token.h
-  - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_ECO4_4MB \"$ESP32C2_ECO4_4MB_TOKEN\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB_G2 \"$ESP32C2_4MB_G2_TOKEN\"" >> at_ota_token.h
+  - echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB_G2 \"$ESP32C2_4MB_G2_TOKEN\"" >> at_ota_token.h
   - cd -
 
 .setup_tokens_esp32c3: &setup_tokens_esp32c3

CMakeLists.txt

@@ -111,8 +111,13 @@ endif()
 
 # add the extra custom components
 if (DEFINED ENV{AT_CUSTOM_COMPONENTS})
-    list(APPEND EXTRA_COMPONENT_DIRS $ENV{AT_CUSTOM_COMPONENTS})
-    message("add extra custom components: $ENV{AT_CUSTOM_COMPONENTS}")
+    set(AT_CUSTOM_COMPONENTS "$ENV{AT_CUSTOM_COMPONENTS}")
+    string(STRIP "${AT_CUSTOM_COMPONENTS}" AT_CUSTOM_COMPONENTS)
+    while("${AT_CUSTOM_COMPONENTS}" MATCHES "  ")
+        string(REPLACE "  " " " AT_CUSTOM_COMPONENTS "${AT_CUSTOM_COMPONENTS}")
+    endwhile()
+    string(REPLACE " " ";" AT_CUSTOM_COMPONENTS "${AT_CUSTOM_COMPONENTS}")
+    list(APPEND EXTRA_COMPONENT_DIRS ${AT_CUSTOM_COMPONENTS})
 endif()
 
 if (EXTRA_COMPONENT_DIRS)

components/at/CMakeLists.txt

@@ -81,5 +81,7 @@ set_property(TARGET ${LIBS} PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DI
 target_link_libraries(${COMPONENT_LIB} INTERFACE ${LIBS})
 set_property(TARGET ${LIBS} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${COMPONENT_LIB})
 
+target_link_options(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_partition_find_first")
+
 # force the referencing of some symbols
 include (force_symbol_ref.cmake)

components/at/lib/VERSION

@@ -1,6 +1,6 @@
-ESP32:   752008f
-ESP32C3: 752008f
-ESP32C2: 752008f
-ESP32C5: 8834929
-ESP32C6: 752008f
-ESP32S2: 752008f
+ESP32:   285d735
+ESP32C3: 285d735
+ESP32C2: 285d735
+ESP32C5: 285d735
+ESP32C6: 285d735
+ESP32S2: 285d735