Merge branch 'refactor/rename_h2_to_h4' into 'master'

esp32h2: renaming esp32h2 to esp32h4

Closes IDF-6098

See merge request espressif/esp-idf!20676

.gitlab/ci/build.yml

@@ -155,20 +155,20 @@ build_pytest_examples_esp32c2:
     IDF_TARGET: esp32c2
     TEST_DIR: examples
 
-build_pytest_examples_esp32h2:
+build_pytest_examples_esp32h4:
   extends:
     - .build_pytest_template
-    - .rules:build:example_test-esp32h2
+    - .rules:build:example_test-esp32h4
   variables:
-    IDF_TARGET: esp32h2
+    IDF_TARGET: esp32h4
     TEST_DIR: examples
 
-build_pytest_components_esp32h2:
+build_pytest_components_esp32h4:
   extends:
     - .build_pytest_template
-    - .rules:build:component_ut-esp32h2
+    - .rules:build:component_ut-esp32h4
   variables:
-    IDF_TARGET: esp32h2
+    IDF_TARGET: esp32h4
     TEST_DIR: components
 
 build_pytest_examples_esp32c6:
@@ -526,12 +526,12 @@ build_examples_cmake_esp32c3:
     IDF_TARGET: esp32c3
     TEST_DIR: examples
 
-build_examples_cmake_esp32h2:
+build_examples_cmake_esp32h4:
   extends:
     - .build_cmake_template
-    - .rules:build:example_test-esp32h2
+    - .rules:build:example_test-esp32h4
   variables:
-    IDF_TARGET: esp32h2
+    IDF_TARGET: esp32h4
     TEST_DIR: examples
 
 build_examples_cmake_esp32c6:

.gitlab/ci/dependencies/dependencies.yml

@@ -3,7 +3,7 @@
   - esp32s2
   - esp32s3
   - esp32c3
-  - esp32h2
+  - esp32h4
   - esp32c2
   - esp32c6
 
@@ -173,7 +173,7 @@ build:integration_test:
     - target_test
     - example_test
   included_in:
-    - "build:example_test-esp32h2"
+    - "build:example_test-esp32h4"
     - "build:example_test-esp32s3"
     - "build:example_test"
     - build:target_test

.gitlab/ci/host-test.yml

@@ -260,10 +260,10 @@ test_efuse_table_on_host_esp32c3:
   variables:
     IDF_TARGET: esp32c3
 
-test_efuse_table_on_host_esp32h2:
+test_efuse_table_on_host_esp32h4:
   extends: .test_efuse_table_on_host_template
   variables:
-    IDF_TARGET: esp32h2
+    IDF_TARGET: esp32h4
 
 test_espcoredump:
   extends: .host_test_template

.gitlab/ci/rules.yml

@@ -387,8 +387,8 @@
 .if-label-component_ut_esp32c6: &if-label-component_ut_esp32c6
   if: '$BOT_LABEL_COMPONENT_UT_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32c6(?:,[^,\n\r]+)*$/i'
 
-.if-label-component_ut_esp32h2: &if-label-component_ut_esp32h2
-  if: '$BOT_LABEL_COMPONENT_UT_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32h2(?:,[^,\n\r]+)*$/i'
+.if-label-component_ut_esp32h4: &if-label-component_ut_esp32h4
+  if: '$BOT_LABEL_COMPONENT_UT_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32h4(?:,[^,\n\r]+)*$/i'
 
 .if-label-component_ut_esp32s2: &if-label-component_ut_esp32s2
   if: '$BOT_LABEL_COMPONENT_UT_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32s2(?:,[^,\n\r]+)*$/i'
@@ -411,8 +411,8 @@
 .if-label-custom_test_esp32c6: &if-label-custom_test_esp32c6
   if: '$BOT_LABEL_CUSTOM_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32c6(?:,[^,\n\r]+)*$/i'
 
-.if-label-custom_test_esp32h2: &if-label-custom_test_esp32h2
-  if: '$BOT_LABEL_CUSTOM_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32h2(?:,[^,\n\r]+)*$/i'
+.if-label-custom_test_esp32h4: &if-label-custom_test_esp32h4
+  if: '$BOT_LABEL_CUSTOM_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32h4(?:,[^,\n\r]+)*$/i'
 
 .if-label-custom_test_esp32s2: &if-label-custom_test_esp32s2
   if: '$BOT_LABEL_CUSTOM_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32s2(?:,[^,\n\r]+)*$/i'
@@ -438,8 +438,8 @@
 .if-label-example_test_esp32c6: &if-label-example_test_esp32c6
   if: '$BOT_LABEL_EXAMPLE_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32c6(?:,[^,\n\r]+)*$/i'
 
-.if-label-example_test_esp32h2: &if-label-example_test_esp32h2
-  if: '$BOT_LABEL_EXAMPLE_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32h2(?:,[^,\n\r]+)*$/i'
+.if-label-example_test_esp32h4: &if-label-example_test_esp32h4
+  if: '$BOT_LABEL_EXAMPLE_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32h4(?:,[^,\n\r]+)*$/i'
 
 .if-label-example_test_esp32s2: &if-label-example_test_esp32s2
   if: '$BOT_LABEL_EXAMPLE_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32s2(?:,[^,\n\r]+)*$/i'
@@ -492,8 +492,8 @@
 .if-label-unit_test_esp32c6: &if-label-unit_test_esp32c6
   if: '$BOT_LABEL_UNIT_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32c6(?:,[^,\n\r]+)*$/i'
 
-.if-label-unit_test_esp32h2: &if-label-unit_test_esp32h2
-  if: '$BOT_LABEL_UNIT_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32h2(?:,[^,\n\r]+)*$/i'
+.if-label-unit_test_esp32h4: &if-label-unit_test_esp32h4
+  if: '$BOT_LABEL_UNIT_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32h4(?:,[^,\n\r]+)*$/i'
 
 .if-label-unit_test_esp32s2: &if-label-unit_test_esp32s2
   if: '$BOT_LABEL_UNIT_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32s2(?:,[^,\n\r]+)*$/i'
@@ -531,7 +531,7 @@
     - <<: *if-label-component_ut_esp32c2
     - <<: *if-label-component_ut_esp32c3
     - <<: *if-label-component_ut_esp32c6
-    - <<: *if-label-component_ut_esp32h2
+    - <<: *if-label-component_ut_esp32h4
     - <<: *if-label-component_ut_esp32s2
     - <<: *if-label-component_ut_esp32s3
     - <<: *if-label-lan8720
@@ -541,7 +541,7 @@
     - <<: *if-label-unit_test_esp32c2
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-label-unit_test_esp32c6
-    - <<: *if-label-unit_test_esp32h2
+    - <<: *if-label-unit_test_esp32h4
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push
@@ -651,17 +651,17 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-i154
 
-.rules:build:component_ut-esp32h2:
+.rules:build:component_ut-esp32h4:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build
     - <<: *if-label-component_ut
-    - <<: *if-label-component_ut_esp32h2
+    - <<: *if-label-component_ut_esp32h4
     - <<: *if-label-target_test
     - <<: *if-label-unit_test
-    - <<: *if-label-unit_test_esp32h2
+    - <<: *if-label-unit_test_esp32h4
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
@@ -734,7 +734,7 @@
     - <<: *if-label-custom_test_esp32c2
     - <<: *if-label-custom_test_esp32c3
     - <<: *if-label-custom_test_esp32c6
-    - <<: *if-label-custom_test_esp32h2
+    - <<: *if-label-custom_test_esp32h4
     - <<: *if-label-custom_test_esp32s2
     - <<: *if-label-custom_test_esp32s3
     - <<: *if-label-target_test
@@ -897,7 +897,7 @@
     - <<: *if-label-example_test_esp32c2
     - <<: *if-label-example_test_esp32c3
     - <<: *if-label-example_test_esp32c6
-    - <<: *if-label-example_test_esp32h2
+    - <<: *if-label-example_test_esp32h4
     - <<: *if-label-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-iperf_stress_test
@@ -1042,14 +1042,14 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-i154
 
-.rules:build:example_test-esp32h2:
+.rules:build:example_test-esp32h4:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build
     - <<: *if-label-example_test
-    - <<: *if-label-example_test_esp32h2
+    - <<: *if-label-example_test_esp32h4
     - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
@@ -1172,23 +1172,23 @@
     - <<: *if-label-component_ut_esp32c2
     - <<: *if-label-component_ut_esp32c3
     - <<: *if-label-component_ut_esp32c6
-    - <<: *if-label-component_ut_esp32h2
+    - <<: *if-label-component_ut_esp32h4
     - <<: *if-label-component_ut_esp32s2
     - <<: *if-label-component_ut_esp32s3
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32
     - <<: *if-label-custom_test_esp32c2
     - <<: *if-label-custom_test_esp32c3
     - <<: *if-label-custom_test_esp32c6
-    - <<: *if-label-custom_test_esp32h2
+    - <<: *if-label-custom_test_esp32h4
     - <<: *if-label-custom_test_esp32s2
     - <<: *if-label-custom_test_esp32s3
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32
     - <<: *if-label-example_test_esp32c2
     - <<: *if-label-example_test_esp32c3
     - <<: *if-label-example_test_esp32c6
-    - <<: *if-label-example_test_esp32h2
+    - <<: *if-label-example_test_esp32h4
     - <<: *if-label-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-integration_test
@@ -1200,7 +1200,7 @@
     - <<: *if-label-unit_test_esp32c2
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-label-unit_test_esp32c6
-    - <<: *if-label-unit_test_esp32h2
+    - <<: *if-label-unit_test_esp32h4
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-label-weekend_test
@@ -1252,7 +1252,7 @@
     - <<: *if-label-unit_test_esp32c2
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-label-unit_test_esp32c6
-    - <<: *if-label-unit_test_esp32h2
+    - <<: *if-label-unit_test_esp32h4
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push
@@ -1524,15 +1524,15 @@
     - <<: *if-dev-push
       changes: *patterns-component_ut-adc
 
-.rules:test:component_ut-esp32h2-i154:
+.rules:test:component_ut-esp32h4-i154:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
     - <<: *if-label-component_ut
-    - <<: *if-label-component_ut_esp32h2
+    - <<: *if-label-component_ut_esp32h4
     - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-target_test-i154

.gitlab/ci/target-test.yml

@@ -532,23 +532,23 @@ component_ut_pytest_esp32c3_sdspi:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, sdcard_spimode ]
 
-component_ut_pytest_esp32h2_i154:
+component_ut_pytest_esp32h4_i154:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32h2-i154
+    - .rules:test:component_ut-esp32h4-i154
   needs:
-    - build_pytest_components_esp32h2
-  tags: [ esp32h2, ieee802154 ]
+    - build_pytest_components_esp32h4
+  tags: [ esp32h4, ieee802154 ]
 
 example_test_pytest_openthread_br:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-i154
   needs:
     - build_pytest_examples_esp32s3
-    - build_pytest_examples_esp32h2
+    - build_pytest_examples_esp32h4
   tags:
-    - esp32h2
+    - esp32h4
     - i154_multi_dut
 
 .pytest_test_apps_dir_template:

Kconfig

@@ -67,26 +67,26 @@ mainmenu "Espressif IoT Development Framework Configuration"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
 
-    config IDF_TARGET_ESP32H2
+    config IDF_TARGET_ESP32H4
         bool
-        default "y" if IDF_TARGET="esp32h2"
+        default "y" if IDF_TARGET="esp32h4"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
 
-    choice IDF_TARGET_ESP32H2_BETA_VERSION
-        prompt "ESP32-H2 beta version"
-        depends on IDF_TARGET_ESP32H2
-        default IDF_TARGET_ESP32H2_BETA_VERSION_2
+    choice IDF_TARGET_ESP32H4_BETA_VERSION
+        prompt "ESP32-H4 beta version"
+        depends on IDF_TARGET_ESP32H4
+        default IDF_TARGET_ESP32H4_BETA_VERSION_2
         help
-            Currently ESP32-H2 has several beta versions for internal use only.
+            Currently ESP32-H4 has several beta versions for internal use only.
             Select the one that matches your chip model.
 
-        config IDF_TARGET_ESP32H2_BETA_VERSION_1
+        config IDF_TARGET_ESP32H4_BETA_VERSION_1
             bool
-            prompt "ESP32-H2 beta1"
-        config IDF_TARGET_ESP32H2_BETA_VERSION_2
+            prompt "ESP32-H4 beta1"
+        config IDF_TARGET_ESP32H4_BETA_VERSION_2
             bool
-            prompt "ESP32-H2 beta2"
+            prompt "ESP32-H4 beta2"
     endchoice
 
     config IDF_TARGET_ESP32C2
@@ -111,10 +111,10 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default 0x0002 if IDF_TARGET_ESP32S2
         default 0x0005 if IDF_TARGET_ESP32C3
         default 0x0009 if IDF_TARGET_ESP32S3
-        default 0x000A if IDF_TARGET_ESP32H2_BETA_VERSION_1
+        default 0x000A if IDF_TARGET_ESP32H4_BETA_VERSION_1
         default 0x000C if IDF_TARGET_ESP32C2
         default 0x000D if IDF_TARGET_ESP32C6
-        default 0x000E if IDF_TARGET_ESP32H2_BETA_VERSION_2 # ESP32H2-TODO: IDF-3475
+        default 0x000E if IDF_TARGET_ESP32H4_BETA_VERSION_2 # ESP32-TODO: IDF-3475
         default 0xFFFF
 
 

README.md

@@ -23,7 +23,7 @@ The following table shows ESP-IDF support of Espressif SoCs where ![alt text][pr
 |ESP32-S3     |                       |                        |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_S3) |
 |ESP32-C2     |                       |                        |                        |                        | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32-C2) |
 |ESP32-C6     |                       |                        |                        |                        |                        | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_C6) |
-|ESP32-H2     |                       |                        |                        | ![alt text][preview]   | ![alt text][preview]   | ![alt text][preview]   | [Announcement](https://www.espressif.com/en/news/ESP32_H2) |
+|ESP32-H2 beta1/2|                    |                        |                        | ![alt text][preview]   | ![alt text][preview]   | ![alt text][preview]   | [Announcement](https://www.espressif.com/en/news/ESP32_H2) |
 
 [supported]: https://img.shields.io/badge/-supported-green "supported"
 [preview]: https://img.shields.io/badge/-preview-orange "preview"

README_CN.md

@@ -23,7 +23,7 @@ ESP-IDF 是乐鑫官方推出的物联网开发框架，支持 Windows、Linux 
 |ESP32-S3     |                       |                        |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_S3) |
 |ESP32-C2     |                       |                        |                        |                        | ![alt text][supported] | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C2) |
 |ESP32-C6     |                       |                        |                        |                        |                        | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_C6) |
-|ESP32-H2     |                       |                        |                        | ![alt text][preview]   | ![alt text][preview]   | ![alt text][preview]   | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_H2) |
+|ESP32-H2 beta1/2|                    |                        |                        | ![alt text][preview]   | ![alt text][preview]   | ![alt text][preview]   | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_H2) |
 
 [supported]: https://img.shields.io/badge/-%E6%94%AF%E6%8C%81-green "supported"
 [preview]: https://img.shields.io/badge/-%E9%A2%84%E8%A7%88-orange "preview"

components/app_trace/Kconfig

@@ -47,7 +47,7 @@ menu "Application Level Tracing"
             select APPTRACE_ENABLE
             select APPTRACE_DEST_UART
             select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=2) && !IDF_TARGET_ESP32C3 && !IDF_TARGET_ESP32S2 && !IDF_TARGET_ESP32H2
+            depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2)
 
         config APPTRACE_DEST_USB_CDC
             bool "USB_CDC"

components/app_update/esp_ota_ops.c

@@ -37,8 +37,8 @@
 #include "esp32c3/rom/secure_boot.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
 #include "esp32s3/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32H2
-#include "esp32h2/rom/secure_boot.h"
+#elif CONFIG_IDF_TARGET_ESP32H4
+#include "esp32h4/rom/secure_boot.h"
 #elif CONFIG_IDF_TARGET_ESP32C2
 #include "esp32c2/rom/secure_boot.h"
 #endif

components/app_update/include/esp_ota_ops.h

@@ -334,7 +334,7 @@ typedef enum {
 /**
  * @brief Revokes the old signature digest. To be called in the application after the rollback logic.
  *
- * Relevant for Secure boot v2 on ESP32-S2, ESP32-S3, ESP32-C3, ESP32-H2 where upto 3 key digests can be stored (Key \#N-1, Key \#N, Key \#N+1).
+ * Relevant for Secure boot v2 on ESP32-S2, ESP32-S3, ESP32-C3, ESP32-H4 where upto 3 key digests can be stored (Key \#N-1, Key \#N, Key \#N+1).
  * When key \#N-1 used to sign an app is invalidated, an OTA update is to be sent with an app signed with key \#N-1 & Key \#N.
  * After successfully booting the OTA app should call this function to revoke Key \#N-1.
  *

components/bootloader/subproject/main/ld/esp32h2/bootloader.ld → components/bootloader/subproject/main/ld/esp32h4/bootloader.ld

@@ -6,7 +6,7 @@
 /** Simplified memory map for the bootloader.
  *  Make sure the bootloader can load into main memory without overwriting itself.
  *
- *  ESP32-H2 ROM static data usage is as follows:
+ *  ESP32-H4 ROM static data usage is as follows:
  *  - 0x3fccb900 - 0x3fcdd210: Shared buffers, used in UART/USB/SPI download mode only
  *  - 0x3fcdd210 - 0x3fcdf210: PRO CPU stack, can be reclaimed as heap after RTOS startup
  *  - 0x3fcdf210 - 0x3fce0000: ROM .bss and .data (not easily reclaimable)