Merge branch 'chore/change_esp32c2_eco4_name' into 'master'

chore: Changed esp32c2-eco4-4mb to esp32c2-4mb-g2 See merge request application/esp-at!1706
espressif · Jan 2, 2025 · 6b22e5a · 6b22e5a
2 parents e03d8c3 + d19dc2c
commit 6b22e5a
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/build_template_esp32c2.yml b/.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: |

diff --git a/.github/workflows/main.yml b/.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:

diff --git a/.gitlab/ci/build_esp32c2.yml b/.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:

diff --git a/.gitlab/ci/build_template.yml b/.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

diff --git a/components/at/private_include/at_ota_token.h b/components/at/private_include/at_ota_token.h
@@ -37,8 +37,8 @@
 #define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_2MB         CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
 #define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB             CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
 #define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB         CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
-#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_ECO4_4MB        CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
-#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_ECO4_4MB    CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB_G2          CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
+#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB_G2      CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
 #elif defined(CONFIG_IDF_TARGET_ESP32C5)
 #define CONFIG_ESP_AT_OTA_TOKEN_ESP32C5_4MB             CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
 #define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C5_4MB         CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT

diff --git a/components/at/src/at_default_config.c b/components/at/src/at_default_config.c
@@ -45,7 +45,7 @@ static const esp_at_module_info_t esp_at_module_info[] = {
 #if defined(CONFIG_IDF_TARGET_ESP32C2)
     {"ESP32C2-2MB",    CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_2MB,         CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_2MB},
     {"ESP32C2-4MB",    CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB,         CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB},
-    {"ESP32C2-ECO4-4MB", CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_ECO4_4MB,  CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_ECO4_4MB},
+    {"ESP32C2-4MB-G2", CONFIG_ESP_AT_OTA_TOKEN_ESP32C2_4MB_G2,      CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C2_4MB_G2},
     {"ESP32C2-BLE-2MB", NULL, NULL},
 #endif
 

diff --git a/components/customized_partitions/raw_data/factory_param/factory_param_data.csv b/components/customized_partitions/raw_data/factory_param/factory_param_data.csv
@@ -12,7 +12,7 @@ PLATFORM_ESP32C3,ESP32C3_RAINMAKER,"support rainmaker cloud, TX:7 RX:6",4,78,1,1
 PLATFORM_ESP32C2,ESP32C2-2MB,"single Wi-Fi, 2MB, TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,19,20
 PLATFORM_ESP32C2,ESP32C2-4MB,"Wi-Fi + BluFi, 4MB, TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,5,4
 PLATFORM_ESP32C2,ESP32C2-BLE-2MB,"single BLE, 2MB, TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,5,4
-PLATFORM_ESP32C2,ESP32C2-ECO4-4MB,"Wi-Fi + BluFi, ECO4 only, 4MB, TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,5,4
+PLATFORM_ESP32C2,ESP32C2-4MB-G2,"Wi-Fi + BluFi, second generation, for ECO4 and later, 4MB, TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,5,4
 PLATFORM_ESP32C5,ESP32C5-4MB,"TX:14 RX:13",4,78,1,1,13,CN,115200,14,13,9,8
 PLATFORM_ESP32C6,ESP32C6-4MB,"TX:7 RX:6",4,78,1,1,13,CN,115200,7,6,5,4
 PLATFORM_ESP32S2,MINI,"TX:17 RX:21",4,78,1,1,13,CN,115200,17,21,20,19
diff --git a/...onfig/module_esp32c2-eco4-4mb/IDF_VERSION → ..._config/module_esp32c2-4mb-g2/IDF_VERSION b/...onfig/module_esp32c2-eco4-4mb/IDF_VERSION → ..._config/module_esp32c2-4mb-g2/IDF_VERSION
diff --git a/.../module_esp32c2-eco4-4mb/at_customize.csv → ...ig/module_esp32c2-4mb-g2/at_customize.csv b/.../module_esp32c2-eco4-4mb/at_customize.csv → ...ig/module_esp32c2-4mb-g2/at_customize.csv
diff --git a/...module_esp32c2-eco4-4mb/partitions_at.csv → ...g/module_esp32c2-4mb-g2/partitions_at.csv b/...module_esp32c2-eco4-4mb/partitions_at.csv → ...g/module_esp32c2-4mb-g2/partitions_at.csv
diff --git a/...le_esp32c2-eco4-4mb/patch/blufi-adv.patch → ...dule_esp32c2-4mb-g2/patch/blufi-adv.patch b/...le_esp32c2-eco4-4mb/patch/blufi-adv.patch → ...dule_esp32c2-4mb-g2/patch/blufi-adv.patch
diff --git a/...ule_esp32c2-eco4-4mb/patch/patch_list.ini → ...odule_esp32c2-4mb-g2/patch/patch_list.ini b/...ule_esp32c2-eco4-4mb/patch/patch_list.ini → ...odule_esp32c2-4mb-g2/patch/patch_list.ini
diff --git a/...co4-4mb/patch/support_ext_partition.patch → ...-4mb-g2/patch/support_ext_partition.patch b/...co4-4mb/patch/support_ext_partition.patch → ...-4mb-g2/patch/support_ext_partition.patch
diff --git a/...odule_esp32c2-eco4-4mb/sdkconfig.defaults → .../module_esp32c2-4mb-g2/sdkconfig.defaults b/...odule_esp32c2-eco4-4mb/sdkconfig.defaults → .../module_esp32c2-4mb-g2/sdkconfig.defaults
@@ -15,9 +15,9 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
 
 # Partition Table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32c2-eco4-4mb/partitions_at.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32c2-4mb-g2/partitions_at.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_FILENAME="module_config/module_esp32c2-eco4-4mb/partitions_at.csv"
+CONFIG_PARTITION_TABLE_FILENAME="module_config/module_esp32c2-4mb-g2/partitions_at.csv"
 CONFIG_PARTITION_TABLE_MD5=n
 
 # PHY
@@ -123,7 +123,7 @@ CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
 
 # AT Customized Partitions
-CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32c2-eco4-4mb/at_customize.csv"
+CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32c2-4mb-g2/at_customize.csv"
 CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_OFFSET=0x1e000
 
 # AT

diff --git a/...p32c2-eco4-4mb/sdkconfig_silence.defaults → ...esp32c2-4mb-g2/sdkconfig_silence.defaults b/...p32c2-eco4-4mb/sdkconfig_silence.defaults → ...esp32c2-4mb-g2/sdkconfig_silence.defaults
@@ -15,9 +15,9 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=n
 
 # Partition Table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32c2-eco4-4mb/partitions_at.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32c2-4mb-g2/partitions_at.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_FILENAME="module_config/module_esp32c2-eco4-4mb/partitions_at.csv"
+CONFIG_PARTITION_TABLE_FILENAME="module_config/module_esp32c2-4mb-g2/partitions_at.csv"
 CONFIG_PARTITION_TABLE_MD5=n
 
 # PHY
@@ -127,7 +127,7 @@ CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
 
 # AT Customized Partitions
-CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32c2-eco4-4mb/at_customize.csv"
+CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32c2-4mb-g2/at_customize.csv"
 CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_OFFSET=0x1e000
 
 # AT