From 94120b82c262bf2f1f711afe0ecbfd237b33ed15 Mon Sep 17 00:00:00 2001 From: Cao Sen Miao Date: Tue, 10 Jan 2023 13:59:46 +0800 Subject: [PATCH] esp32h2: add build test --- .gitlab/ci/build.yml | 49 ++++++++ .gitlab/ci/default-build-test-rules.yml | 4 +- .gitlab/ci/rules.yml | 114 ++++++++++++++++++ components/app_update/.build-test-rules.yml | 4 +- .../bootloader_support/.build-test-rules.yml | 4 +- .../src/flash_encryption/flash_encrypt.c | 2 +- .../test_apps/bootloader_support/README.md | 4 +- .../test_apps/rtc_custom_section/README.md | 4 +- .../console/test_apps/console/README.md | 4 +- components/driver/.build-test-rules.yml | 8 ++ components/driver/test/test_i2c.c | 4 +- .../esp_serial_slave_link/CMakeLists.txt | 12 +- .../include/test_spi_utils.h | 2 +- components/driver/test_apps/gpio/README.md | 4 +- .../driver/test_apps/gpio/main/test_gpio.c | 4 +- .../driver/test_apps/gpio/main/test_gpio.h | 4 +- .../driver/test_apps/gpio/main/test_rtcio.c | 2 +- .../test_apps/gpio_extensions/README.md | 4 +- .../gpio_extensions/pytest_gpio_extensions.py | 5 +- components/driver/test_apps/gptimer/README.md | 4 +- .../test_apps/legacy_timer_driver/README.md | 4 +- components/driver/test_apps/rs485/README.md | 4 +- .../spi/master/main/test_spi_bus_lock.c | 2 +- .../driver/test_apps/spi/param/README.md | 4 +- .../driver/test_apps/spi/slave_hd/README.md | 4 +- components/driver/test_apps/uart/README.md | 4 +- components/efuse/test_apps/README.md | 4 +- components/efuse/test_apps/pytest_efuse.py | 3 +- components/esp-tls/test_apps/README.md | 4 +- components/esp_app_format/test_apps/README.md | 4 +- .../esp_common/test_apps/esp_common/README.md | 4 +- .../esp_http_client/test_apps/README.md | 4 +- .../esp_http_server/test_apps/README.md | 4 +- .../esp_hw_support/.build-test-rules.yml | 6 +- .../esp_hw_support/test_apps/dma/README.md | 4 +- .../test_apps/dma/pytest_dma.py | 3 +- .../esp_hw_support_unity_tests/README.md | 4 +- components/esp_lcd/.build-test-rules.yml | 8 ++ components/esp_netif/.build-test-rules.yml | 4 +- components/esp_netif/test/test_esp_netif.c | 4 +- components/esp_phy/test/test_phy_rtc.c | 2 +- components/esp_pm/.build-test-rules.yml | 2 +- components/esp_pm/Kconfig | 4 +- components/esp_rom/test_apps/README.md | 4 +- .../esp_rom/test_apps/pytest_esp_rom.py | 3 +- components/esp_system/test/test_sleep.c | 4 +- components/esp_system/test/test_task_wdt.c | 10 +- components/esp_timer/.build-test-rules.yml | 2 +- components/esp_wifi/.build-test-rules.yml | 2 + components/espcoredump/test_apps/README.md | 4 +- components/fatfs/.build-test-rules.yml | 4 + components/fatfs/test_apps/flash_ro/README.md | 4 +- components/fatfs/test_apps/flash_wl/README.md | 4 +- .../freertos/test_apps/freertos/README.md | 4 +- .../test_apps/freertos/pytest_freertos.py | 2 +- components/hal/esp32h2/include/hal/gpio_ll.h | 7 +- components/hal/test/test_mpu.c | 2 +- components/heap/test_apps/README.md | 4 +- components/lwip/test_afl_host/README.md | 4 +- components/lwip/test_apps/README.md | 4 +- components/mbedtls/test_apps/README.md | 4 +- components/mqtt/test/test_mqtt5.c | 6 +- components/newlib/test/test_newlib.c | 6 +- components/newlib/test_apps/README.md | 4 +- components/protocomm/test_apps/README.md | 4 +- .../test_apps/pthread_unity_tests/README.md | 4 +- components/sdmmc/test/test_sd.c | 2 +- .../esp32h2/include/soc/Kconfig.soc_caps.in | 24 ---- components/soc/esp32h2/include/soc/soc_caps.h | 12 +- components/spi_flash/.build-test-rules.yml | 10 +- .../spi_flash/test/test_cache_disabled.c | 4 +- components/spi_flash/test/test_esp_flash.c | 5 +- components/spi_flash/test/test_read_write.c | 4 +- .../esp_flash/main/test_esp_flash_def.h | 4 +- .../test_apps/flash_encryption/README.md | 4 +- components/spiffs/test_apps/README.md | 4 +- components/wpa_supplicant/test/test_crypto.c | 4 +- components/wpa_supplicant/test/test_eloop.c | 2 + .../wpa_supplicant/test/test_offchannel.c | 2 +- conftest.py | 3 +- examples/build_system/.build-test-rules.yml | 2 +- .../cmake/component_manager/README.md | 4 +- .../build_system/cmake/idf_as_lib/README.md | 4 +- .../build_system/cmake/import_lib/README.md | 4 +- .../cmake/import_prebuilt/README.md | 4 +- .../build_system/cmake/multi_config/README.md | 4 +- examples/build_system/cmake/plugins/README.md | 4 +- examples/build_system/wrappers/README.md | 4 +- .../bootloader_hooks/README.md | 4 +- .../bootloader_override/README.md | 4 +- examples/cxx/.build-test-rules.yml | 8 +- examples/cxx/exceptions/README.md | 4 +- examples/cxx/experimental/blink_cxx/README.md | 4 +- .../esp_event_async_cxx/README.md | 4 +- .../cxx/experimental/esp_event_cxx/README.md | 4 +- .../cxx/experimental/esp_timer_cxx/README.md | 4 +- .../experimental_cpp_component/gpio_cxx.cpp | 2 + .../test/test_cxx_exceptions.cpp | 2 +- .../test/test_esp_timer.cpp | 18 +-- .../test/test_i2c.cpp | 4 +- examples/cxx/pthread/README.md | 4 +- examples/cxx/rtti/README.md | 4 +- examples/ethernet/.build-test-rules.yml | 10 +- examples/ethernet/basic/README.md | 4 +- examples/get-started/.build-test-rules.yml | 7 +- examples/get-started/hello_world/README.md | 4 +- examples/get-started/sample_project/README.md | 4 +- examples/mesh/.build-test-rules.yml | 1 + examples/network/.build-test-rules.yml | 6 +- examples/openthread/.build-test-rules.yml | 4 + examples/peripherals/.build-test-rules.yml | 34 +++++- .../peripherals/gpio/generic_gpio/README.md | 4 +- .../peripherals/timer_group/gptimer/README.md | 4 +- .../timer_group/legacy_driver/README.md | 4 +- .../uart/nmea0183_parser/README.md | 4 +- .../uart/uart_async_rxtxtasks/README.md | 4 +- examples/peripherals/uart/uart_echo/README.md | 4 +- .../uart/uart_echo_rs485/README.md | 4 +- .../peripherals/uart/uart_events/README.md | 4 +- examples/peripherals/uart/uart_repl/README.md | 4 +- .../peripherals/uart/uart_select/README.md | 4 +- examples/protocols/.build-test-rules.yml | 98 ++++++++++++++- examples/protocols/cbor/README.md | 4 +- examples/provisioning/.build-test-rules.yml | 1 + examples/security/.build-test-rules.yml | 2 +- examples/security/flash_encryption/README.md | 4 +- examples/storage/.build-test-rules.yml | 30 +++-- .../storage/custom_flash_driver/README.md | 4 +- examples/storage/fatfsgen/README.md | 4 +- examples/storage/nvs_rw_blob/README.md | 4 +- examples/storage/nvs_rw_value/README.md | 4 +- examples/storage/nvs_rw_value_cxx/README.md | 4 +- .../partition_api/partition_find/README.md | 4 +- .../partition_api/partition_mmap/README.md | 4 +- .../partition_api/partition_ops/README.md | 4 +- examples/storage/parttool/README.md | 4 +- examples/storage/semihost_vfs/README.md | 4 +- examples/storage/spiffs/README.md | 4 +- examples/storage/spiffsgen/README.md | 4 +- examples/storage/wear_levelling/README.md | 4 +- examples/system/.build-test-rules.yml | 43 ++++--- examples/system/base_mac_address/README.md | 4 +- examples/system/efuse/README.md | 4 +- .../esp_event/default_event_loop/README.md | 4 +- .../esp_event/user_event_loops/README.md | 4 +- examples/system/eventfd/README.md | 4 +- examples/system/eventfd/pytest_eventfd.py | 3 +- .../system/freertos/real_time_stats/README.md | 4 +- examples/system/gcov/README.md | 4 +- examples/system/pthread/README.md | 4 +- examples/system/select/README.md | 4 +- examples/system/startup_time/README.md | 4 +- examples/system/sysview_tracing/README.md | 4 +- .../system/sysview_tracing_heap_log/README.md | 4 +- examples/system/task_watchdog/README.md | 4 +- .../task_watchdog/pytest_task_watchdog.py | 3 +- examples/system/unit_test/README.md | 4 +- examples/wifi/.build-test-rules.yml | 4 + examples/zigbee/.build-test-rules.yml | 2 +- tools/ci/check_copyright_ignore.txt | 1 - tools/idf_py_actions/constants.py | 2 +- tools/test_apps/.build-test-rules.yml | 14 +-- .../build_system/embed_test/README.md | 4 +- .../build_system/ldalign_test/README.md | 4 +- .../build_system/ldgen_test/README.md | 4 +- .../build_system/rsource_test/README.md | 4 +- .../main/port/esp32c6/Kconfig.port | 1 + .../main/port/esp32h2/Kconfig.port | 1 + .../hello_world_linux_compatible/README.md | 4 +- .../protocols/mqtt/build_test/README.md | 4 +- .../test_apps/security/secure_boot/README.md | 4 +- .../system/bootloader_sections/README.md | 4 +- tools/test_apps/system/build_test/README.md | 4 +- .../test_apps/system/cxx_build_test/README.md | 4 +- .../test_apps/system/g1_components/README.md | 4 +- tools/test_apps/system/gdb/README.md | 4 +- .../system/monitor_addr_lookup/README.md | 4 +- tools/test_apps/system/panic/README.md | 4 +- tools/test_apps/system/startup/README.md | 4 +- .../test_utils/test/ccomp_timer_test_data.c | 6 +- .../test_utils/test/ccomp_timer_test_inst.c | 2 +- 181 files changed, 727 insertions(+), 388 deletions(-) create mode 100644 tools/test_apps/build_system/rsource_test/main/port/esp32c6/Kconfig.port create mode 100644 tools/test_apps/build_system/rsource_test/main/port/esp32h2/Kconfig.port diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index fd88b6c113..c450b3ca9f 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -250,6 +250,14 @@ build_pytest_examples_esp32c6: IDF_TARGET: esp32c6 TEST_DIR: examples +build_pytest_examples_esp32h2: + extends: + - .build_pytest_template + - .rules:build:example_test-esp32h2 + variables: + IDF_TARGET: esp32h2 + TEST_DIR: examples + build_pytest_components_esp32: extends: - .build_pytest_template @@ -304,6 +312,14 @@ build_pytest_components_esp32c6: IDF_TARGET: esp32c6 TEST_DIR: components +build_pytest_components_esp32h2: + extends: + - .build_pytest_template + - .rules:build:component_ut-esp32h2 + variables: + IDF_TARGET: esp32h2 + TEST_DIR: components + build_non_test_components_apps: extends: - .build_cmake_template @@ -391,6 +407,14 @@ build_pytest_test_apps_esp32c6: IDF_TARGET: esp32c6 TEST_DIR: tools/test_apps +build_pytest_test_apps_esp32h2: + extends: + - .build_pytest_test_apps_template + - .rules:build:custom_test-esp32h2 + variables: + IDF_TARGET: esp32h2 + TEST_DIR: tools/test_apps + .build_template_app_template: extends: - .build_template @@ -562,6 +586,13 @@ build_esp_idf_tests_cmake_esp32c6: variables: IDF_TARGET: esp32c6 +build_esp_idf_tests_cmake_esp32h2: + extends: + - .build_esp_idf_tests_cmake_template + - .rules:build:unit_test-esp32h2 + variables: + IDF_TARGET: esp32h2 + build_examples_cmake_esp32: extends: - .build_cmake_template @@ -624,6 +655,16 @@ build_examples_cmake_esp32c6: IDF_TARGET: esp32c6 TEST_DIR: examples +build_examples_cmake_esp32h2: + extends: + - .build_cmake_template + - .rules:build:example_test-esp32h2 + parallel: 2 + variables: + IDF_TARGET: esp32h2 + TEST_DIR: examples + + build_test_apps_esp32: extends: - .build_cmake_template @@ -676,6 +717,14 @@ build_test_apps_esp32c6: IDF_TARGET: esp32c6 TEST_DIR: tools/test_apps +build_test_apps_esp32h2: + extends: + - .build_cmake_template + - .rules:build:custom_test-esp32h2 + variables: + IDF_TARGET: esp32h2 + TEST_DIR: tools/test_apps + build_clang_test_apps_esp32: extends: - .build_cmake_clang_template diff --git a/.gitlab/ci/default-build-test-rules.yml b/.gitlab/ci/default-build-test-rules.yml index 52a27a6d3b..77f094f3b6 100644 --- a/.gitlab/ci/default-build-test-rules.yml +++ b/.gitlab/ci/default-build-test-rules.yml @@ -8,8 +8,10 @@ # This file should ONLY be used during bringup. Should be reset to empty after the bringup process extra_default_build_targets: - esp32c6 + - esp32h2 -# bypass_check_test_targets: +bypass_check_test_targets: + - esp32h2 # - esp32c6 # # These lines would diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 8c5538f24b..d46e1fe926 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -702,6 +702,34 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi +.rules:build:component_ut-esp32h2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32h2 + - <<: *if-label-target_test + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32h2 + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-usb + - <<: *if-dev-push + changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc + - <<: *if-dev-push + changes: *patterns-target_test-i154 + - <<: *if-dev-push + changes: *patterns-target_test-wifi + .rules:build:component_ut-esp32h4: rules: - <<: *if-revert-branch @@ -915,6 +943,30 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi +.rules:build:custom_test-esp32h2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32h2 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-custom_test + - <<: *if-dev-push + changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc + - <<: *if-dev-push + changes: *patterns-target_test-i154 + - <<: *if-dev-push + changes: *patterns-target_test-wifi + .rules:build:custom_test-esp32h4: rules: - <<: *if-revert-branch @@ -1195,6 +1247,42 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi +.rules:build:example_test-esp32h2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32h2 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-build-example_test + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-example_test + - <<: *if-dev-push + changes: *patterns-example_test-bt + - <<: *if-dev-push + changes: *patterns-example_test-ethernet + - <<: *if-dev-push + changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-usb + - <<: *if-dev-push + changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc + - <<: *if-dev-push + changes: *patterns-target_test-i154 + - <<: *if-dev-push + changes: *patterns-target_test-wifi + .rules:build:example_test-esp32h4: rules: - <<: *if-revert-branch @@ -1567,6 +1655,32 @@ - <<: *if-dev-push changes: *patterns-unit_test-sdio +.rules:build:unit_test-esp32h2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-target_test + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32h2 + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc + - <<: *if-dev-push + changes: *patterns-target_test-i154 + - <<: *if-dev-push + changes: *patterns-target_test-wifi + - <<: *if-dev-push + changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-sdio + .rules:build:unit_test-esp32s2: rules: - <<: *if-revert-branch diff --git a/components/app_update/.build-test-rules.yml b/components/app_update/.build-test-rules.yml index 6d53128e02..fbe8883b7a 100644 --- a/components/app_update/.build-test-rules.yml +++ b/components/app_update/.build-test-rules.yml @@ -2,6 +2,6 @@ components/app_update/test_apps: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6 is not supported yet + reason: target esp32c6, esp32h2 is not supported yet diff --git a/components/bootloader_support/.build-test-rules.yml b/components/bootloader_support/.build-test-rules.yml index f13bfd6485..5c4483fd70 100644 --- a/components/bootloader_support/.build-test-rules.yml +++ b/components/bootloader_support/.build-test-rules.yml @@ -6,6 +6,6 @@ components/bootloader_support/test_apps/rtc_custom_section: temporary: false reason: esp32c2 does not have RTC memory disable_test: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6 is not supported yet + reason: target esp32c6/esp32h2 is not supported yet diff --git a/components/bootloader_support/src/flash_encryption/flash_encrypt.c b/components/bootloader_support/src/flash_encryption/flash_encrypt.c index d8f426e158..ef74be46e4 100644 --- a/components/bootloader_support/src/flash_encryption/flash_encrypt.c +++ b/components/bootloader_support/src/flash_encryption/flash_encrypt.c @@ -433,7 +433,7 @@ esp_err_t esp_flash_encrypt_region(uint32_t src_addr, size_t data_length) return ESP_FAIL; } -#if CONFIG_IDF_TARGET_ESP32C6 // TODO: IDF-5653 +#if CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2 // TODO: IDF-5653 wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &LP_WDT}; #else wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL}; diff --git a/components/bootloader_support/test_apps/bootloader_support/README.md b/components/bootloader_support/test_apps/bootloader_support/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/bootloader_support/test_apps/bootloader_support/README.md +++ b/components/bootloader_support/test_apps/bootloader_support/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/bootloader_support/test_apps/rtc_custom_section/README.md b/components/bootloader_support/test_apps/rtc_custom_section/README.md index 6f026d8e9e..19f1d19a54 100644 --- a/components/bootloader_support/test_apps/rtc_custom_section/README.md +++ b/components/bootloader_support/test_apps/rtc_custom_section/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/console/test_apps/console/README.md b/components/console/test_apps/console/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/console/test_apps/console/README.md +++ b/components/console/test_apps/console/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/.build-test-rules.yml b/components/driver/.build-test-rules.yml index 72884f099a..a8858841da 100644 --- a/components/driver/.build-test-rules.yml +++ b/components/driver/.build-test-rules.yml @@ -84,6 +84,14 @@ components/driver/test_apps/sdio: temporary: true reason: Not supported. +components/driver/test_apps/spi/master: + disable: + - if: SOC_GPSPI_SUPPORTED != 1 + +components/driver/test_apps/spi/slave: + disable: + - if: SOC_GPSPI_SUPPORTED != 1 + components/driver/test_apps/temperature_sensor: disable: - if: SOC_TEMP_SENSOR_SUPPORTED != 1 diff --git a/components/driver/test/test_i2c.c b/components/driver/test/test_i2c.c index 52c61162bd..4154233c7b 100644 --- a/components/driver/test/test_i2c.c +++ b/components/driver/test/test_i2c.c @@ -25,7 +25,7 @@ #include "hal/gpio_hal.h" #include "hal/uart_ll.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #if SOC_I2C_SUPPORT_SLAVE // i2c test can't work without slave #define DATA_LENGTH 512 /*! None: @pytest.mark.esp32c2 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.generic @@ -35,6 +37,7 @@ def test_gpio_filter(dut: IdfDut) -> None: @pytest.mark.esp32c2 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.generic diff --git a/components/driver/test_apps/gptimer/README.md b/components/driver/test_apps/gptimer/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/driver/test_apps/gptimer/README.md +++ b/components/driver/test_apps/gptimer/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/legacy_timer_driver/README.md b/components/driver/test_apps/legacy_timer_driver/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/driver/test_apps/legacy_timer_driver/README.md +++ b/components/driver/test_apps/legacy_timer_driver/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/rs485/README.md b/components/driver/test_apps/rs485/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/driver/test_apps/rs485/README.md +++ b/components/driver/test_apps/rs485/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c b/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c index e859a29f06..80c70aadd4 100644 --- a/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c +++ b/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c @@ -296,7 +296,7 @@ TEST_CASE("spi bus lock","[spi]") test_bus_lock(false); } -#if !DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP32C2, ESP32H4, ESP32C6) +#if !SOC_MEMSPI_IS_INDEPENDENT //disable, SPI1 is not available for GPSPI usage on chips later than ESP32 static IRAM_ATTR esp_err_t test_polling_send(spi_device_handle_t handle) { diff --git a/components/driver/test_apps/spi/param/README.md b/components/driver/test_apps/spi/param/README.md index 2beabff547..07b81b7c84 100644 --- a/components/driver/test_apps/spi/param/README.md +++ b/components/driver/test_apps/spi/param/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/driver/test_apps/spi/slave_hd/README.md b/components/driver/test_apps/spi/slave_hd/README.md index 2beabff547..07b81b7c84 100644 --- a/components/driver/test_apps/spi/slave_hd/README.md +++ b/components/driver/test_apps/spi/slave_hd/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/driver/test_apps/uart/README.md b/components/driver/test_apps/uart/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/driver/test_apps/uart/README.md +++ b/components/driver/test_apps/uart/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/efuse/test_apps/README.md b/components/efuse/test_apps/README.md index cd9be654c0..0d3b8c0661 100644 --- a/components/efuse/test_apps/README.md +++ b/components/efuse/test_apps/README.md @@ -1,3 +1,3 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/efuse/test_apps/pytest_efuse.py b/components/efuse/test_apps/pytest_efuse.py index f518183483..e44d4263cb 100644 --- a/components/efuse/test_apps/pytest_efuse.py +++ b/components/efuse/test_apps/pytest_efuse.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Unlicense OR CC0-1.0 from time import sleep @@ -11,6 +11,7 @@ from pytest_embedded import Dut @pytest.mark.esp32c2 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic def test_efuse(dut: Dut) -> None: dut.expect_exact('Press ENTER to see the list of tests') diff --git a/components/esp-tls/test_apps/README.md b/components/esp-tls/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp-tls/test_apps/README.md +++ b/components/esp-tls/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_app_format/test_apps/README.md b/components/esp_app_format/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_app_format/test_apps/README.md +++ b/components/esp_app_format/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_common/test_apps/esp_common/README.md b/components/esp_common/test_apps/esp_common/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_common/test_apps/esp_common/README.md +++ b/components/esp_common/test_apps/esp_common/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_http_client/test_apps/README.md b/components/esp_http_client/test_apps/README.md index cd9be654c0..0d3b8c0661 100644 --- a/components/esp_http_client/test_apps/README.md +++ b/components/esp_http_client/test_apps/README.md @@ -1,3 +1,3 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_http_server/test_apps/README.md b/components/esp_http_server/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_http_server/test_apps/README.md +++ b/components/esp_http_server/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_hw_support/.build-test-rules.yml b/components/esp_hw_support/.build-test-rules.yml index 9f131e0743..4bfe3dec9c 100644 --- a/components/esp_hw_support/.build-test-rules.yml +++ b/components/esp_hw_support/.build-test-rules.yml @@ -6,13 +6,17 @@ components/esp_hw_support/test_apps/dma: temporary: false reason: Neither GDMA nor CPDMA is supported on ESP32 +components/esp_hw_support/test_apps/esp_hw_support_unity_tests: + disable: + - if: SOC_GPSPI_SUPPORTED != 1 + components/esp_hw_support/test_apps/etm: disable: - if: SOC_ETM_SUPPORTED != 1 components/esp_hw_support/test_apps/rtc_clk: disable: - - if: IDF_TARGET in ["esp32c6"] + - if: IDF_TARGET in ["esp32c6", "esp32h2"] temporary: true reason: Unsupported on C6 for now. TODO IDF-5645 diff --git a/components/esp_hw_support/test_apps/dma/README.md b/components/esp_hw_support/test_apps/dma/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_hw_support/test_apps/dma/README.md +++ b/components/esp_hw_support/test_apps/dma/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_hw_support/test_apps/dma/pytest_dma.py b/components/esp_hw_support/test_apps/dma/pytest_dma.py index b45fae6055..f4af7ebafc 100644 --- a/components/esp_hw_support/test_apps/dma/pytest_dma.py +++ b/components/esp_hw_support/test_apps/dma/pytest_dma.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest @@ -10,6 +10,7 @@ from pytest_embedded import Dut @pytest.mark.esp32c2 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/README.md b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/README.md +++ b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_lcd/.build-test-rules.yml b/components/esp_lcd/.build-test-rules.yml index 8df02267ec..bf0d5f66a5 100644 --- a/components/esp_lcd/.build-test-rules.yml +++ b/components/esp_lcd/.build-test-rules.yml @@ -1,5 +1,9 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/esp_lcd/test_apps/i2c_lcd: + disable: + - if: SOC_I2C_SUPPORTED != 1 + components/esp_lcd/test_apps/i80_lcd: disable: - if: SOC_LCD_I80_SUPPORTED != 1 @@ -7,3 +11,7 @@ components/esp_lcd/test_apps/i80_lcd: components/esp_lcd/test_apps/rgb_lcd: disable: - if: SOC_LCD_RGB_SUPPORTED != 1 + +components/esp_lcd/test_apps/spi_lcd: + disable: + - if: SOC_GPSPI_SUPPORTED != 1 diff --git a/components/esp_netif/.build-test-rules.yml b/components/esp_netif/.build-test-rules.yml index a6a408dc20..cd01e6eb10 100644 --- a/components/esp_netif/.build-test-rules.yml +++ b/components/esp_netif/.build-test-rules.yml @@ -2,9 +2,9 @@ components/esp_netif/test_apps/test_app_esp_netif: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" # IDF-6704 temporary: true - reason: target esp32c6 is not supported yet + reason: target esp32c6, esp32h2 is not supported yet disable_test: - if: IDF_TARGET not in ["esp32s2", "esp32c3"] temporary: false diff --git a/components/esp_netif/test/test_esp_netif.c b/components/esp_netif/test/test_esp_netif.c index 4e618cab07..bda76acc1b 100644 --- a/components/esp_netif/test/test_esp_netif.c +++ b/components/esp_netif/test/test_esp_netif.c @@ -76,7 +76,7 @@ TEST_CASE("esp_netif: create and delete multiple netifs", "[esp_netif][leaks=0]" } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) //IDF-5047 TEST_CASE("esp_netif: test dhcp client state transitions for wifi station", "[esp_netif]") @@ -328,7 +328,7 @@ TEST_CASE("esp_netif: convert ip address from string", "[esp_netif]") TEST_ASSERT_EQUAL(ESP_ERR_INVALID_ARG, esp_netif_str_to_ip6(ipv6_src[0], NULL)); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) //IDF-5047 TEST_CASE("esp_netif: create and destroy default wifi interfaces", "[esp_netif][leaks=0]") { diff --git a/components/esp_phy/test/test_phy_rtc.c b/components/esp_phy/test/test_phy_rtc.c index f855daeb99..8a58ee98d2 100644 --- a/components/esp_phy/test/test_phy_rtc.c +++ b/components/esp_phy/test/test_phy_rtc.c @@ -13,7 +13,7 @@ #include "soc/soc_caps.h" #include "esp_private/wifi.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) //IDF-5046 #include "esp_phy_init.h" diff --git a/components/esp_pm/.build-test-rules.yml b/components/esp_pm/.build-test-rules.yml index d55a544579..12b9c2ccaf 100644 --- a/components/esp_pm/.build-test-rules.yml +++ b/components/esp_pm/.build-test-rules.yml @@ -2,6 +2,6 @@ components/esp_pm/test_apps/esp_pm: disable: - - if: IDF_TARGET in ["esp32c6"] + - if: IDF_TARGET in ["esp32c6", "esp32h2"] temporary: true reason: Not supported yet diff --git a/components/esp_pm/Kconfig b/components/esp_pm/Kconfig index 15dee40de2..a92fa47ad0 100644 --- a/components/esp_pm/Kconfig +++ b/components/esp_pm/Kconfig @@ -2,10 +2,10 @@ menu "Power Management" config PM_ENABLE bool "Support for power management" # SMP FreeRTOS currently does not support power management IDF-4997 - # ESP32C6 currently does not support power management IDF-5347 + # ESP32C6 currently does not support power management IDF-5347 IDF-6270 # Note. Disabling this option for C6 will also cause all sdkconfig.release test cases run without pm enabled # ORed with __DOXYGEN__ to pass C6 docs build, need to remove when pm is supported on C6 - depends on (!FREERTOS_SMP && !IDF_TARGET_ESP32C6) || __DOXYGEN__ + depends on (!FREERTOS_SMP && !IDF_TARGET_ESP32C6 && !IDF_TARGET_ESP32H2) || __DOXYGEN__ default n help If enabled, application is compiled with support for power management. diff --git a/components/esp_rom/test_apps/README.md b/components/esp_rom/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_rom/test_apps/README.md +++ b/components/esp_rom/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_rom/test_apps/pytest_esp_rom.py b/components/esp_rom/test_apps/pytest_esp_rom.py index ecb961ca75..48f01d1163 100644 --- a/components/esp_rom/test_apps/pytest_esp_rom.py +++ b/components/esp_rom/test_apps/pytest_esp_rom.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic @pytest.mark.nightly_run def test_esp_rom(dut: Dut) -> None: diff --git a/components/esp_system/test/test_sleep.c b/components/esp_system/test/test_sleep.c index dd5f34a10f..664ca3039f 100644 --- a/components/esp_system/test/test_sleep.c +++ b/components/esp_system/test/test_sleep.c @@ -34,7 +34,7 @@ __attribute__((unused)) static struct timeval tv_start, tv_stop; -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #ifndef CONFIG_FREERTOS_UNICORE static void deep_sleep_task(void *arg) { @@ -590,4 +590,4 @@ TEST_CASE("wake up using GPIO (2 or 4 low)", "[deepsleep][ignore]") } #endif // SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP #endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) TODO: IDF-5348, IDF-5349 +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) TODO: IDF-5348, IDF-5349 diff --git a/components/esp_system/test/test_task_wdt.c b/components/esp_system/test/test_task_wdt.c index 858112281f..82485292f0 100644 --- a/components/esp_system/test/test_task_wdt.c +++ b/components/esp_system/test/test_task_wdt.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -23,7 +23,7 @@ void esp_task_wdt_isr_user_handler(void) timeout_flag = true; } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) TEST_CASE("Task WDT task timeout", "[task_wdt]") { timeout_flag = false; @@ -94,7 +94,7 @@ TEST_CASE("Task WDT can be reconfigured", "[task_wdt]") TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_delete(NULL)); TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit()); } -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) TEST_CASE("Task WDT task feed", "[task_wdt]") { @@ -115,7 +115,7 @@ TEST_CASE("Task WDT task feed", "[task_wdt]") TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit()); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) TEST_CASE("Task WDT user timeout", "[task_wdt]") { const char *user_name = "test_user"; @@ -134,7 +134,7 @@ TEST_CASE("Task WDT user timeout", "[task_wdt]") TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_delete_user(user_handle)); TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit()); } -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) TEST_CASE("Task WDT user feed", "[task_wdt]") { diff --git a/components/esp_timer/.build-test-rules.yml b/components/esp_timer/.build-test-rules.yml index 5bc062a221..b7026465c9 100644 --- a/components/esp_timer/.build-test-rules.yml +++ b/components/esp_timer/.build-test-rules.yml @@ -2,6 +2,6 @@ components/esp_timer/test_apps: disable: - - if: IDF_TARGET in ["esp32c6"] + - if: IDF_TARGET in ["esp32c6", "esp32h2"] # Sleep support IDF-6267 temporary: true reason: Not supported yet diff --git a/components/esp_wifi/.build-test-rules.yml b/components/esp_wifi/.build-test-rules.yml index 02d625d72f..bf19dc53b2 100644 --- a/components/esp_wifi/.build-test-rules.yml +++ b/components/esp_wifi/.build-test-rules.yml @@ -1,6 +1,8 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps components/esp_wifi/test_apps/wifi_connect: + disable: + - if: SOC_WIFI_SUPPORTED != 1 disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3", "esp32c2"] reason: leak of runner diff --git a/components/espcoredump/test_apps/README.md b/components/espcoredump/test_apps/README.md index f5f0074d6c..667c590cdb 100644 --- a/components/espcoredump/test_apps/README.md +++ b/components/espcoredump/test_apps/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # ESP Core Dump Tests diff --git a/components/fatfs/.build-test-rules.yml b/components/fatfs/.build-test-rules.yml index 22625abc19..f5ce9a3225 100644 --- a/components/fatfs/.build-test-rules.yml +++ b/components/fatfs/.build-test-rules.yml @@ -5,3 +5,7 @@ components/fatfs/test_apps/sdcard: - if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6"] temporary: true reason: No sdspi runners for these targets + disable: + - if: IDF_TARGET == "esp32h2" #wait for SDSPI IDF-6244 + temporary: true + reason: esp32h2 not supported diff --git a/components/fatfs/test_apps/flash_ro/README.md b/components/fatfs/test_apps/flash_ro/README.md index 6bcc4aa63f..2dcdd2161a 100644 --- a/components/fatfs/test_apps/flash_ro/README.md +++ b/components/fatfs/test_apps/flash_ro/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | This test app runs a few FATFS test cases in a read-only FAT partition. diff --git a/components/fatfs/test_apps/flash_wl/README.md b/components/fatfs/test_apps/flash_wl/README.md index 3e098284e1..051b47665a 100644 --- a/components/fatfs/test_apps/flash_wl/README.md +++ b/components/fatfs/test_apps/flash_wl/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | This test app runs a few FATFS test cases in a wear levelling FAT partition. diff --git a/components/freertos/test_apps/freertos/README.md b/components/freertos/test_apps/freertos/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/freertos/test_apps/freertos/README.md +++ b/components/freertos/test_apps/freertos/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/freertos/test_apps/freertos/pytest_freertos.py b/components/freertos/test_apps/freertos/pytest_freertos.py index a2e62c0049..b6467965af 100644 --- a/components/freertos/test_apps/freertos/pytest_freertos.py +++ b/components/freertos/test_apps/freertos/pytest_freertos.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 import pytest diff --git a/components/hal/esp32h2/include/hal/gpio_ll.h b/components/hal/esp32h2/include/hal/gpio_ll.h index b8a5f7cf4d..0ef1c4b23d 100644 --- a/components/hal/esp32h2/include/hal/gpio_ll.h +++ b/components/hal/esp32h2/include/hal/gpio_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -109,6 +109,7 @@ static inline void gpio_ll_set_intr_type(gpio_dev_t *hw, gpio_num_t gpio_num, gp * @param core_id interrupt core id * @param status interrupt status */ +__attribute__((always_inline)) static inline void gpio_ll_get_intr_status(gpio_dev_t *hw, uint32_t core_id, uint32_t *status) { *status = hw->pcpu_int.val; @@ -121,6 +122,7 @@ static inline void gpio_ll_get_intr_status(gpio_dev_t *hw, uint32_t core_id, uin * @param core_id interrupt core id * @param status interrupt status high */ +__attribute__((always_inline)) static inline void gpio_ll_get_intr_status_high(gpio_dev_t *hw, uint32_t core_id, uint32_t *status) { *status = 0; // Less than 32 GPIOs in ESP32-H2 @@ -132,6 +134,7 @@ static inline void gpio_ll_get_intr_status_high(gpio_dev_t *hw, uint32_t core_id * @param hw Peripheral GPIO hardware instance address. * @param mask interrupt status clear mask */ +__attribute__((always_inline)) static inline void gpio_ll_clear_intr_status(gpio_dev_t *hw, uint32_t mask) { // hw->status_w1tc = mask; @@ -143,6 +146,7 @@ static inline void gpio_ll_clear_intr_status(gpio_dev_t *hw, uint32_t mask) * @param hw Peripheral GPIO hardware instance address. * @param mask interrupt status high clear mask */ +__attribute__((always_inline)) static inline void gpio_ll_clear_intr_status_high(gpio_dev_t *hw, uint32_t mask) { // Not supported on H2 @@ -257,6 +261,7 @@ static inline void gpio_ll_od_enable(gpio_dev_t *hw, gpio_num_t gpio_num) * @param gpio_num GPIO number. If you want to set the output level of e.g. GPIO16, gpio_num should be GPIO_NUM_16 (16); * @param level Output level. 0: low ; 1: high */ +__attribute__((always_inline)) static inline void gpio_ll_set_level(gpio_dev_t *hw, gpio_num_t gpio_num, uint32_t level) { // if (level) { diff --git a/components/hal/test/test_mpu.c b/components/hal/test/test_mpu.c index 21d87e6b23..dec5847807 100644 --- a/components/hal/test/test_mpu.c +++ b/components/hal/test/test_mpu.c @@ -10,7 +10,7 @@ // LL still not implemented #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3) -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6, ESP32H2) //IDF-5058 volatile static int RTC_NOINIT_ATTR access = 0; diff --git a/components/heap/test_apps/README.md b/components/heap/test_apps/README.md index 2beabff547..07b81b7c84 100644 --- a/components/heap/test_apps/README.md +++ b/components/heap/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/lwip/test_afl_host/README.md b/components/lwip/test_afl_host/README.md index 3793b98ad0..953be4341f 100644 --- a/components/lwip/test_afl_host/README.md +++ b/components/lwip/test_afl_host/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | ## Introduction This test uses [american fuzzy lop](http://lcamtuf.coredump.cx/afl/) to mangle real dns, dhcp client, dhcp server packets and look for exceptions caused by the parser. diff --git a/components/lwip/test_apps/README.md b/components/lwip/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/lwip/test_apps/README.md +++ b/components/lwip/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/mbedtls/test_apps/README.md b/components/mbedtls/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/mbedtls/test_apps/README.md +++ b/components/mbedtls/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/mqtt/test/test_mqtt5.c b/components/mqtt/test/test_mqtt5.c index 6b052759ae..d9bfe82e7c 100644 --- a/components/mqtt/test/test_mqtt5.c +++ b/components/mqtt/test/test_mqtt5.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -19,7 +19,7 @@ #include "esp_mac.h" #include "esp_partition.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) static esp_mqtt5_user_property_item_t user_property_arr[3] = { {"board", "esp32"}, {"u", "user"}, @@ -151,4 +151,4 @@ TEST_CASE("mqtt5 broker tests", "[mqtt5][test_env=UT_T2_Ethernet]") connect_test_fixture_teardown(); } #endif // SOC_EMAC_SUPPORTED -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) diff --git a/components/newlib/test/test_newlib.c b/components/newlib/test/test_newlib.c index 715ee0373c..90e546fcef 100644 --- a/components/newlib/test/test_newlib.c +++ b/components/newlib/test/test_newlib.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -122,7 +122,7 @@ TEST_CASE("test asctime", "[newlib]") TEST_ASSERT_EQUAL_STRING(buf, time_str); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) static bool fn_in_rom(void *fn) { const int fnaddr = (int)fn; @@ -158,7 +158,7 @@ TEST_CASE("check if ROM or Flash is used for functions", "[newlib]") TEST_ASSERT_FALSE(fn_in_rom(strtol)); #endif // defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_SPIRAM) } -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #ifndef CONFIG_NEWLIB_NANO_FORMAT TEST_CASE("test 64bit int formats", "[newlib]") diff --git a/components/newlib/test_apps/README.md b/components/newlib/test_apps/README.md index b5be4985c5..f6be630bb4 100644 --- a/components/newlib/test_apps/README.md +++ b/components/newlib/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/protocomm/test_apps/README.md b/components/protocomm/test_apps/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/protocomm/test_apps/README.md +++ b/components/protocomm/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/pthread/test_apps/pthread_unity_tests/README.md b/components/pthread/test_apps/pthread_unity_tests/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/pthread/test_apps/pthread_unity_tests/README.md +++ b/components/pthread/test_apps/pthread_unity_tests/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/sdmmc/test/test_sd.c b/components/sdmmc/test/test_sd.c index c63701726f..77000b13ac 100644 --- a/components/sdmmc/test/test_sd.c +++ b/components/sdmmc/test/test_sd.c @@ -32,7 +32,7 @@ // Currently no runners for S3 #define WITH_SD_TEST (SOC_SDMMC_HOST_SUPPORTED && !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)) // Currently, no runners for S3, C2, and C6 -#define WITH_SDSPI_TEST (!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C2, ESP32C6)) +#define WITH_SDSPI_TEST (!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C2, ESP32C6, ESP32H2)) // Can't test eMMC (slot 0) and PSRAM together #define WITH_EMMC_TEST (SOC_SDMMC_HOST_SUPPORTED && !CONFIG_SPIRAM && !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)) diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 54f9594469..2aee085443 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -251,10 +251,6 @@ config SOC_I2C_FIFO_LEN int default 32 -config SOC_I2C_SUPPORT_SLAVE - bool - default y - config SOC_I2C_SUPPORT_HW_CLR_BUS bool default y @@ -283,10 +279,6 @@ config SOC_I2S_SUPPORTS_PCM bool default y -config SOC_I2S_SUPPORTS_PDM - bool - default y - config SOC_I2S_SUPPORTS_PDM_TX bool default y @@ -295,10 +287,6 @@ config SOC_I2S_PDM_MAX_TX_LINES int default 2 -config SOC_I2S_SUPPORTS_TDM - bool - default y - config SOC_LEDC_SUPPORT_PLL_DIV_CLOCK bool default y @@ -395,14 +383,6 @@ config SOC_RMT_SUPPORT_TX_ASYNC_STOP bool default y -config SOC_RMT_SUPPORT_TX_LOOP_COUNT - bool - default y - -config SOC_RMT_SUPPORT_TX_LOOP_AUTO_STOP - bool - default y - config SOC_RMT_SUPPORT_TX_SYNCHRO bool default y @@ -663,10 +643,6 @@ config SOC_TIMER_GROUP_TOTAL_TIMERS int default 2 -config SOC_TIMER_SUPPORT_ETM - bool - default y - config SOC_TWAI_CONTROLLER_NUM bool default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index 85822dddd7..e4c93f32c6 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -176,7 +176,7 @@ #define SOC_I2C_NUM (1U) #define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */ -#define SOC_I2C_SUPPORT_SLAVE (1) +// #define SOC_I2C_SUPPORT_SLAVE (1) // FSM_RST only resets the FSM, not using it. So SOC_I2C_SUPPORT_HW_FSM_RST not defined. #define SOC_I2C_SUPPORT_HW_CLR_BUS (1) @@ -190,10 +190,10 @@ #define SOC_I2S_HW_VERSION_2 (1) #define SOC_I2S_SUPPORTS_XTAL (1) #define SOC_I2S_SUPPORTS_PCM (1) -#define SOC_I2S_SUPPORTS_PDM (1) +// #define SOC_I2S_SUPPORTS_PDM (1) #define SOC_I2S_SUPPORTS_PDM_TX (1) #define SOC_I2S_PDM_MAX_TX_LINES (2) -#define SOC_I2S_SUPPORTS_TDM (1) +// #define SOC_I2S_SUPPORTS_TDM (1) // TODO: IDF-6235 (Copy from esp32c6, need check) /*-------------------------- LEDC CAPS ---------------------------------------*/ @@ -230,8 +230,8 @@ #define SOC_RMT_SUPPORT_RX_PINGPONG 1 /*!< Support Ping-Pong mode on RX path */ #define SOC_RMT_SUPPORT_RX_DEMODULATION 1 /*!< Support signal demodulation on RX path (i.e. remove carrier) */ #define SOC_RMT_SUPPORT_TX_ASYNC_STOP 1 /*!< Support stop transmission asynchronously */ -#define SOC_RMT_SUPPORT_TX_LOOP_COUNT 1 /*!< Support transmit specified number of cycles in loop mode */ -#define SOC_RMT_SUPPORT_TX_LOOP_AUTO_STOP 1 /*!< Hardware support of auto-stop in loop mode */ +// #define SOC_RMT_SUPPORT_TX_LOOP_COUNT 1 /*!< Support transmit specified number of cycles in loop mode */ +// #define SOC_RMT_SUPPORT_TX_LOOP_AUTO_STOP 1 /*!< Hardware support of auto-stop in loop mode */ #define SOC_RMT_SUPPORT_TX_SYNCHRO 1 /*!< Support coordinate a group of TX channels to start simultaneously */ #define SOC_RMT_SUPPORT_TX_CARRIER_DATA_ONLY 1 /*!< TX carrier can be modulated to data phase only */ #define SOC_RMT_SUPPORT_XTAL 1 /*!< Support set XTAL clock as the RMT clock source */ @@ -351,7 +351,7 @@ #define SOC_TIMER_GROUP_SUPPORT_PLL_F48M (1) // #define SOC_TIMER_GROUP_SUPPORT_RC_FAST (1) // TODO: IDF-6265 #define SOC_TIMER_GROUP_TOTAL_TIMERS (2) -#define SOC_TIMER_SUPPORT_ETM (1) +// #define SOC_TIMER_SUPPORT_ETM (1) // TODO: IDF-6217 (Copy from esp32c6, need check) /*-------------------------- TWAI CAPS ---------------------------------------*/ diff --git a/components/spi_flash/.build-test-rules.yml b/components/spi_flash/.build-test-rules.yml index 75439ba8ab..89ee01ae91 100644 --- a/components/spi_flash/.build-test-rules.yml +++ b/components/spi_flash/.build-test-rules.yml @@ -2,18 +2,18 @@ components/spi_flash/test_apps/esp_flash: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6 cannot pass atomic build + reason: target esp32c6 cannot pass atomic build, target esp32h2 currently doesn't support GPSPI. components/spi_flash/test_apps/flash_encryption: disable_test: - - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6"] + - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6", "esp32h2"] temporary: true reason: No runners # IDF-5634 components/spi_flash/test_apps/flash_mmap: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6 is not supported yet + reason: target esp32c6, esp32h2 is not supported yet diff --git a/components/spi_flash/test/test_cache_disabled.c b/components/spi_flash/test/test_cache_disabled.c index 0739de1341..802fcc128c 100644 --- a/components/spi_flash/test/test_cache_disabled.c +++ b/components/spi_flash/test/test_cache_disabled.c @@ -19,7 +19,7 @@ #include "esp_private/cache_utils.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) static QueueHandle_t result_queue; static IRAM_ATTR void cache_test_task(void *arg) @@ -107,4 +107,4 @@ TEST_CASE("invalid access to cache raises panic (APP CPU)", "[spi_flash][reset=" #endif // !CONFIG_FREERTOS_UNICORE #endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2) -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) diff --git a/components/spi_flash/test/test_esp_flash.c b/components/spi_flash/test/test_esp_flash.c index bd13c81391..f29c276f4d 100644 --- a/components/spi_flash/test/test_esp_flash.c +++ b/components/spi_flash/test/test_esp_flash.c @@ -124,7 +124,7 @@ #define HSPI_PIN_NUM_CS FSPI_PIN_NUM_CS #endif -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #define TEST_CONFIG_NUM (sizeof(config_list)/sizeof(flashtest_config_t)) typedef void (*flash_test_func_t)(const esp_partition_t *part); @@ -651,5 +651,4 @@ TEST_CASE("Test esp_flash read/write performance", "[esp_flash][test_env=UT_T1_E #endif TEST_CASE_MULTI_FLASH("Test esp_flash read/write performance", test_flash_read_write_performance); - -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c index 8f7ca910c2..d7cd12c2c7 100644 --- a/components/spi_flash/test/test_read_write.c +++ b/components/spi_flash/test/test_read_write.c @@ -144,7 +144,7 @@ TEST_CASE("Test spi_flash_read", "[spi_flash][esp_flash]") extern void spi_common_set_dummy_output(esp_rom_spiflash_read_mode_t mode); extern void spi_dummy_len_fix(uint8_t spi, uint8_t freqdiv); -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) static void IRAM_ATTR fix_rom_func(void) { uint32_t freqdiv = 0; @@ -305,7 +305,7 @@ TEST_CASE("Test esp_flash_write", "[spi_flash][esp_flash]") ESP_ERROR_CHECK(esp_flash_write(NULL, (char *) 0x40080000, start, 16)); #endif } -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #ifdef CONFIG_SPIRAM diff --git a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_def.h b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_def.h index 9127cf8ae7..f28b6f3e69 100644 --- a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_def.h +++ b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_def.h @@ -88,7 +88,7 @@ #define HSPI_PIN_NUM_WP FSPI_PIN_NUM_WP #define HSPI_PIN_NUM_CS FSPI_PIN_NUM_CS -#elif CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2 #define FSPI_PIN_NUM_MOSI 7 #define FSPI_PIN_NUM_MISO 2 @@ -244,7 +244,7 @@ flashtest_config_t config_list[] = { .input_delay_ns = 0, }, }; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 +#else flashtest_config_t config_list[] = { /* No SPI1 CS1 flash on esp32c3 test */ { diff --git a/components/spi_flash/test_apps/flash_encryption/README.md b/components/spi_flash/test_apps/flash_encryption/README.md index 2872ceed56..304c4d955a 100644 --- a/components/spi_flash/test_apps/flash_encryption/README.md +++ b/components/spi_flash/test_apps/flash_encryption/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | ## Prepare runner diff --git a/components/spiffs/test_apps/README.md b/components/spiffs/test_apps/README.md index f69f732a4e..7f0be53ea2 100644 --- a/components/spiffs/test_apps/README.md +++ b/components/spiffs/test_apps/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | This is a test app for spiffs component. diff --git a/components/wpa_supplicant/test/test_crypto.c b/components/wpa_supplicant/test/test_crypto.c index c569661d22..32ccb05d54 100644 --- a/components/wpa_supplicant/test/test_crypto.c +++ b/components/wpa_supplicant/test/test_crypto.c @@ -315,7 +315,7 @@ TEST_CASE("Test crypto lib bignum apis", "[wpa_crypto]") #endif /* bits in mbedtls_mpi_uint */ -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) //IDF-5046 /* @@ -541,5 +541,5 @@ TEST_CASE("Test crypto lib ECC apis", "[wpa_crypto]") } } +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) #endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) diff --git a/components/wpa_supplicant/test/test_eloop.c b/components/wpa_supplicant/test/test_eloop.c index a997204417..095816707e 100644 --- a/components/wpa_supplicant/test/test_eloop.c +++ b/components/wpa_supplicant/test/test_eloop.c @@ -18,6 +18,7 @@ #include "memory_checks.h" #include +#if SOC_WIFI_SUPPORTED uint32_t timeouts_usec[6] = { 10000, 1000, 10000, 5000, 15000, 1000 }; uint32_t timeouts_sec[6] = { 10, 1, 10, 5, 15, 1 }; int executed_order[6]; @@ -82,3 +83,4 @@ TEST_CASE("Test eloop timers run", "[eloop]") TEST_ESP_OK(esp_wifi_deinit()); os_sleep(3, 0); } +#endif //SOC_WIFI_SUPPORTED diff --git a/components/wpa_supplicant/test/test_offchannel.c b/components/wpa_supplicant/test/test_offchannel.c index 05458a4b4c..b26d16a349 100644 --- a/components/wpa_supplicant/test/test_offchannel.c +++ b/components/wpa_supplicant/test/test_offchannel.c @@ -32,7 +32,7 @@ #define TEST_LISTEN_CHANNEL 6 /* No runners */ -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2, ESP32C6) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2, ESP32C6, ESP32H2) //IDF-5046 static const char *TAG = "test_offchan"; esp_netif_t *wifi_netif; diff --git a/conftest.py b/conftest.py index 2b4a4f0bc2..37a14e8188 100644 --- a/conftest.py +++ b/conftest.py @@ -49,7 +49,7 @@ except ImportError: sys.path.append(os.path.join(os.path.dirname(__file__), 'tools', 'ci', 'python_packages')) import common_test_methods # noqa: F401 -SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6'] +SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6', 'esp32h2'] PREVIEW_TARGETS = ['esp32h4'] # this PREVIEW_TARGETS excludes 'linux' target DEFAULT_SDKCONFIG = 'default' @@ -61,6 +61,7 @@ TARGET_MARKERS = { 'esp32c2': 'support esp32c2 target', 'esp32c6': 'support esp32c6 target', 'esp32h4': 'support esp32h4 target', + 'esp32h2': 'support esp32h2 target', 'linux': 'support linux target', } diff --git a/examples/build_system/.build-test-rules.yml b/examples/build_system/.build-test-rules.yml index f0e9fd5623..89bed00ded 100644 --- a/examples/build_system/.build-test-rules.yml +++ b/examples/build_system/.build-test-rules.yml @@ -2,7 +2,7 @@ examples/build_system/cmake/import_lib: disable_test: - - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32s2", "esp32s3", "esp32c6"] + - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32s2", "esp32s3", "esp32c6", "esp32h2"] temporary: true reason: lack of runners diff --git a/examples/build_system/cmake/component_manager/README.md b/examples/build_system/cmake/component_manager/README.md index 68ff76339e..cefd5002b2 100644 --- a/examples/build_system/cmake/component_manager/README.md +++ b/examples/build_system/cmake/component_manager/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Using the component manager for downloading dependencies diff --git a/examples/build_system/cmake/idf_as_lib/README.md b/examples/build_system/cmake/idf_as_lib/README.md index 55283956eb..bd291059bb 100644 --- a/examples/build_system/cmake/idf_as_lib/README.md +++ b/examples/build_system/cmake/idf_as_lib/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Using ESP-IDF in Custom CMake Projects diff --git a/examples/build_system/cmake/import_lib/README.md b/examples/build_system/cmake/import_lib/README.md index 18810a4e4d..6dddb7f02b 100644 --- a/examples/build_system/cmake/import_lib/README.md +++ b/examples/build_system/cmake/import_lib/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Import Third-Party CMake Library Example diff --git a/examples/build_system/cmake/import_prebuilt/README.md b/examples/build_system/cmake/import_prebuilt/README.md index ddf16e7d40..3b9ca0261b 100644 --- a/examples/build_system/cmake/import_prebuilt/README.md +++ b/examples/build_system/cmake/import_prebuilt/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Import Prebuilt Library Example diff --git a/examples/build_system/cmake/multi_config/README.md b/examples/build_system/cmake/multi_config/README.md index 66695a7a44..0eaae79cb2 100644 --- a/examples/build_system/cmake/multi_config/README.md +++ b/examples/build_system/cmake/multi_config/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Multiple Build Configurations Example diff --git a/examples/build_system/cmake/plugins/README.md b/examples/build_system/cmake/plugins/README.md index 4eb867d052..b00bfb4126 100644 --- a/examples/build_system/cmake/plugins/README.md +++ b/examples/build_system/cmake/plugins/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Link Time Plugins Registration diff --git a/examples/build_system/wrappers/README.md b/examples/build_system/wrappers/README.md index 9d4ffd9845..8b66d57626 100644 --- a/examples/build_system/wrappers/README.md +++ b/examples/build_system/wrappers/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Using wrapper to redefine IDF functions diff --git a/examples/custom_bootloader/bootloader_hooks/README.md b/examples/custom_bootloader/bootloader_hooks/README.md index 6292d5299d..2e9c7444cf 100644 --- a/examples/custom_bootloader/bootloader_hooks/README.md +++ b/examples/custom_bootloader/bootloader_hooks/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Bootloader hooks diff --git a/examples/custom_bootloader/bootloader_override/README.md b/examples/custom_bootloader/bootloader_override/README.md index cf32eb86f7..43ed3a6d25 100644 --- a/examples/custom_bootloader/bootloader_override/README.md +++ b/examples/custom_bootloader/bootloader_override/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Bootloader override diff --git a/examples/cxx/.build-test-rules.yml b/examples/cxx/.build-test-rules.yml index 459e2b4135..cd393b6766 100644 --- a/examples/cxx/.build-test-rules.yml +++ b/examples/cxx/.build-test-rules.yml @@ -14,13 +14,13 @@ examples/cxx/experimental/esp_modem_cxx: examples/cxx/experimental/esp_mqtt_cxx/ssl: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true reason: target esp32c6 is not supported yet examples/cxx/experimental/esp_mqtt_cxx/tcp: disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true reason: target esp32c6 is not supported yet @@ -31,13 +31,13 @@ examples/cxx/experimental/experimental_cpp_component/host_test: examples/cxx/experimental/simple_i2c_rw_example: disable: - - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" + - if: IDF_TARGET in ["esp32c2", "esp32c6", "esp32h2"] temporary: true reason: target(s) not supported yet examples/cxx/experimental/simple_spi_rw_example: disable: - - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" + - if: IDF_TARGET in ["esp32c2", "esp32c6", "esp32h2"] temporary: true reason: target(s) not supported yet diff --git a/examples/cxx/exceptions/README.md b/examples/cxx/exceptions/README.md index 4c02b08fde..c4f322e92a 100644 --- a/examples/cxx/exceptions/README.md +++ b/examples/cxx/exceptions/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Example: C++ exception handling diff --git a/examples/cxx/experimental/blink_cxx/README.md b/examples/cxx/experimental/blink_cxx/README.md index 92f3e36c4f..2396178dc6 100644 --- a/examples/cxx/experimental/blink_cxx/README.md +++ b/examples/cxx/experimental/blink_cxx/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Example: Blink C++ example diff --git a/examples/cxx/experimental/esp_event_async_cxx/README.md b/examples/cxx/experimental/esp_event_async_cxx/README.md index 87c6550c12..ae6d93e816 100644 --- a/examples/cxx/experimental/esp_event_async_cxx/README.md +++ b/examples/cxx/experimental/esp_event_async_cxx/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # ESP-Event asynchronous example diff --git a/examples/cxx/experimental/esp_event_cxx/README.md b/examples/cxx/experimental/esp_event_cxx/README.md index 3b557c5cb3..9577bab5fc 100644 --- a/examples/cxx/experimental/esp_event_cxx/README.md +++ b/examples/cxx/experimental/esp_event_cxx/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # ESP Event synchronous example diff --git a/examples/cxx/experimental/esp_timer_cxx/README.md b/examples/cxx/experimental/esp_timer_cxx/README.md index 1d6b97c1b0..19d82b3838 100644 --- a/examples/cxx/experimental/esp_timer_cxx/README.md +++ b/examples/cxx/experimental/esp_timer_cxx/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Example: ESPTimer C++ class diff --git a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp index 9afbfb13cc..d2401ec6f7 100644 --- a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp @@ -29,6 +29,8 @@ constexpr std::array INVALID_GPIOS = {}; constexpr std::array INVALID_GPIOS = {}; #elif CONFIG_IDF_TARGET_ESP32C6 constexpr std::array INVALID_GPIOS = {}; +#elif CONFIG_IDF_TARGET_ESP32H2 +constexpr std::array INVALID_GPIOS = {}; #else #error "No GPIOs defined for the current target" #endif diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp index ad350fd3ae..f9021334d9 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp @@ -14,7 +14,7 @@ using namespace idf; #if CONFIG_IDF_TARGET_ESP32 #define LEAKS "300" -#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2 #define LEAKS "800" #else #error "unknown target in CXX tests, can't set leaks threshold" diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_esp_timer.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_esp_timer.cpp index fb13f22a99..c352c8d508 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_esp_timer.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_esp_timer.cpp @@ -1,16 +1,8 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifdef __cpp_exceptions diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp index 2c43a49b5d..2574fe9013 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp @@ -32,7 +32,7 @@ static constexpr I2CNumber I2C_SLAVE_NUM(I2CNumber::I2C0()); /*! None: diff --git a/examples/system/freertos/real_time_stats/README.md b/examples/system/freertos/real_time_stats/README.md index 4f5b511677..e1c9a5cb40 100644 --- a/examples/system/freertos/real_time_stats/README.md +++ b/examples/system/freertos/real_time_stats/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # FreeRTOS Real Time Stats Example diff --git a/examples/system/gcov/README.md b/examples/system/gcov/README.md index 4f5c92fcdb..830cc1ef9e 100644 --- a/examples/system/gcov/README.md +++ b/examples/system/gcov/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Blink Example With Coverage Info (Gcov) diff --git a/examples/system/pthread/README.md b/examples/system/pthread/README.md index 72320d088e..1b112f60dd 100644 --- a/examples/system/pthread/README.md +++ b/examples/system/pthread/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Pthread Example diff --git a/examples/system/select/README.md b/examples/system/select/README.md index 8bd9c1f255..cb6ad40c24 100644 --- a/examples/system/select/README.md +++ b/examples/system/select/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Synchronous I/O multiplexing example diff --git a/examples/system/startup_time/README.md b/examples/system/startup_time/README.md index e5a56f9a32..f3c6942fe4 100644 --- a/examples/system/startup_time/README.md +++ b/examples/system/startup_time/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Startup Time Example diff --git a/examples/system/sysview_tracing/README.md b/examples/system/sysview_tracing/README.md index 4257ce0df5..8cca4d0178 100644 --- a/examples/system/sysview_tracing/README.md +++ b/examples/system/sysview_tracing/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Example: Application Level Tracing - SystemView Tracing (sysview_tracing) This test code shows how to perform system-wide behavioral analysis of the program using [SEGGER SystemView tool](https://www.segger.com/products/development-tools/systemview/). diff --git a/examples/system/sysview_tracing_heap_log/README.md b/examples/system/sysview_tracing_heap_log/README.md index 49b764c163..8c4aa50c37 100644 --- a/examples/system/sysview_tracing_heap_log/README.md +++ b/examples/system/sysview_tracing_heap_log/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # SystemView Heap and Log Tracing Example diff --git a/examples/system/task_watchdog/README.md b/examples/system/task_watchdog/README.md index 7f4571a73b..b915051ff0 100644 --- a/examples/system/task_watchdog/README.md +++ b/examples/system/task_watchdog/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Task Watchdog Example diff --git a/examples/system/task_watchdog/pytest_task_watchdog.py b/examples/system/task_watchdog/pytest_task_watchdog.py index a25ada616f..91028453ce 100644 --- a/examples/system/task_watchdog/pytest_task_watchdog.py +++ b/examples/system/task_watchdog/pytest_task_watchdog.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest @@ -11,6 +11,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s3 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic def test_task_watchdog(dut: Dut) -> None: diff --git a/examples/system/unit_test/README.md b/examples/system/unit_test/README.md index 9d76342b62..8c288a654b 100644 --- a/examples/system/unit_test/README.md +++ b/examples/system/unit_test/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Unit Testing diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml index 1e9011a6c8..d42b3bfa35 100644 --- a/examples/wifi/.build-test-rules.yml +++ b/examples/wifi/.build-test-rules.yml @@ -11,12 +11,16 @@ examples/wifi/ftm: reason: the other targets are not tested yet examples/wifi/getting_started: + disable: + - if: SOC_WIFI_SUPPORTED != 1 disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32c2", "esp32s3"] temporary: true reason: lack of runners examples/wifi/iperf: + disable: + - if: SOC_WIFI_SUPPORTED != 1 disable_test: - if: IDF_TARGET != "esp32" temporary: true diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml index 8eba6204c9..f815e041c2 100644 --- a/examples/zigbee/.build-test-rules.yml +++ b/examples/zigbee/.build-test-rules.yml @@ -2,7 +2,7 @@ examples/zigbee/esp_zigbee_gateway: disable: - - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" + - if: IDF_TARGET in ["esp32c2", "esp32c6", "esp32h2"] temporary: true reason: target(s) not supported yet diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index fc5c2b16ba..2994d44592 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1449,7 +1449,6 @@ examples/cxx/experimental/experimental_cpp_component/include/esp_event_api.hpp examples/cxx/experimental/experimental_cpp_component/include/esp_timer_cxx.hpp examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp examples/cxx/experimental/experimental_cpp_component/test/test_esp_event_cxx.cpp -examples/cxx/experimental/experimental_cpp_component/test/test_esp_timer.cpp examples/cxx/experimental/sensor_mcp9808/main/sensor_mcp9808.cpp examples/cxx/pthread/example_test.py examples/cxx/pthread/main/cpp_pthread.cpp diff --git a/tools/idf_py_actions/constants.py b/tools/idf_py_actions/constants.py index 61b84813f1..d060823fb8 100644 --- a/tools/idf_py_actions/constants.py +++ b/tools/idf_py_actions/constants.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 import collections import multiprocessing diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 31979770ef..7fc8297b8b 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -11,16 +11,14 @@ tools/test_apps/build_system/ldgen_test: temporary: true reason: target esp32c2 is not supported yet -tools/test_apps/build_system/rsource_test: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet - tools/test_apps/linux_compatible/hello_world_linux_compatible: enable: - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux" +tools/test_apps/peripherals/i2c_wifi: + disable: + - if: SOC_I2C_SUPPORTED != 1 or SOC_WIFI_SUPPORTED != 1 + tools/test_apps/peripherals/usb: enable: - if: IDF_TARGET in ["esp32s2", "esp32s3"] @@ -119,9 +117,9 @@ tools/test_apps/system/gdb_loadable_elf: temporary: true reason: lack of runners disable: - - if: IDF_TARGET == "esp32c6" + - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6 is not supported yet + reason: target esp32c6, esp32h2 is not supported yet tools/test_apps/system/longjmp_test: enable: diff --git a/tools/test_apps/build_system/embed_test/README.md b/tools/test_apps/build_system/embed_test/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/tools/test_apps/build_system/embed_test/README.md +++ b/tools/test_apps/build_system/embed_test/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/test_apps/build_system/ldalign_test/README.md b/tools/test_apps/build_system/ldalign_test/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/tools/test_apps/build_system/ldalign_test/README.md +++ b/tools/test_apps/build_system/ldalign_test/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/test_apps/build_system/ldgen_test/README.md b/tools/test_apps/build_system/ldgen_test/README.md index 6b2206942e..63d036cfb6 100644 --- a/tools/test_apps/build_system/ldgen_test/README.md +++ b/tools/test_apps/build_system/ldgen_test/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | Runs a build test to check ldgen places libraries, objects and symbols correctly as specified in the linker fragments. Specifically, this app diff --git a/tools/test_apps/build_system/rsource_test/README.md b/tools/test_apps/build_system/rsource_test/README.md index b5be4985c5..a8b7833fa3 100644 --- a/tools/test_apps/build_system/rsource_test/README.md +++ b/tools/test_apps/build_system/rsource_test/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/test_apps/build_system/rsource_test/main/port/esp32c6/Kconfig.port b/tools/test_apps/build_system/rsource_test/main/port/esp32c6/Kconfig.port new file mode 100644 index 0000000000..c18c28fd4d --- /dev/null +++ b/tools/test_apps/build_system/rsource_test/main/port/esp32c6/Kconfig.port @@ -0,0 +1 @@ +rsource "../../../Kconfig.extra" diff --git a/tools/test_apps/build_system/rsource_test/main/port/esp32h2/Kconfig.port b/tools/test_apps/build_system/rsource_test/main/port/esp32h2/Kconfig.port new file mode 100644 index 0000000000..c18c28fd4d --- /dev/null +++ b/tools/test_apps/build_system/rsource_test/main/port/esp32h2/Kconfig.port @@ -0,0 +1 @@ +rsource "../../../Kconfig.extra" diff --git a/tools/test_apps/linux_compatible/hello_world_linux_compatible/README.md b/tools/test_apps/linux_compatible/hello_world_linux_compatible/README.md index 379ef646a7..5009b444f6 100644 --- a/tools/test_apps/linux_compatible/hello_world_linux_compatible/README.md +++ b/tools/test_apps/linux_compatible/hello_world_linux_compatible/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | Linux | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | ----- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | Linux | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | ----- | # Hello World Example Compatible with POSIX-port diff --git a/tools/test_apps/protocols/mqtt/build_test/README.md b/tools/test_apps/protocols/mqtt/build_test/README.md index 2a2585db79..9a4c5c545d 100644 --- a/tools/test_apps/protocols/mqtt/build_test/README.md +++ b/tools/test_apps/protocols/mqtt/build_test/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Build only test for C++ diff --git a/tools/test_apps/security/secure_boot/README.md b/tools/test_apps/security/secure_boot/README.md index ccd2f8395c..2d5c3f025c 100644 --- a/tools/test_apps/security/secure_boot/README.md +++ b/tools/test_apps/security/secure_boot/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Secure Boot diff --git a/tools/test_apps/system/bootloader_sections/README.md b/tools/test_apps/system/bootloader_sections/README.md index cdb3ea5c87..231ef09a3e 100644 --- a/tools/test_apps/system/bootloader_sections/README.md +++ b/tools/test_apps/system/bootloader_sections/README.md @@ -1,4 +1,4 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | We have no rtc memory on ESP32-C2. diff --git a/tools/test_apps/system/build_test/README.md b/tools/test_apps/system/build_test/README.md index efbe0bd2f7..aee192bfcd 100644 --- a/tools/test_apps/system/build_test/README.md +++ b/tools/test_apps/system/build_test/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | Efuse on ESP32-C2 not supported diff --git a/tools/test_apps/system/cxx_build_test/README.md b/tools/test_apps/system/cxx_build_test/README.md index 9a2e73b51b..5d06d766df 100644 --- a/tools/test_apps/system/cxx_build_test/README.md +++ b/tools/test_apps/system/cxx_build_test/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # C++ build test diff --git a/tools/test_apps/system/g1_components/README.md b/tools/test_apps/system/g1_components/README.md index 451ae4fed0..d235c5e956 100644 --- a/tools/test_apps/system/g1_components/README.md +++ b/tools/test_apps/system/g1_components/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # "G1"-components-only app diff --git a/tools/test_apps/system/gdb/README.md b/tools/test_apps/system/gdb/README.md index cb513db5d7..341c7215cf 100644 --- a/tools/test_apps/system/gdb/README.md +++ b/tools/test_apps/system/gdb/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # IDF GDB test application diff --git a/tools/test_apps/system/monitor_addr_lookup/README.md b/tools/test_apps/system/monitor_addr_lookup/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/tools/test_apps/system/monitor_addr_lookup/README.md +++ b/tools/test_apps/system/monitor_addr_lookup/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/test_apps/system/panic/README.md b/tools/test_apps/system/panic/README.md index a5a7b613e5..9720983ce6 100644 --- a/tools/test_apps/system/panic/README.md +++ b/tools/test_apps/system/panic/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Introduction diff --git a/tools/test_apps/system/startup/README.md b/tools/test_apps/system/startup/README.md index c7ab5f4044..30cd8e3cef 100644 --- a/tools/test_apps/system/startup/README.md +++ b/tools/test_apps/system/startup/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c index 0014f48d4e..157ba0bb04 100644 --- a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c +++ b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c @@ -47,8 +47,7 @@ typedef struct { /* No performance monitor in RISCV for now */ -#if !DISABLED_FOR_TARGETS(ESP32C3) -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6) +#if !__riscv //IDF-5052 static const char* TAG = "test_ccomp_timer"; @@ -178,5 +177,4 @@ TEST_CASE("data cache hit rate sweep", "[test_utils][ccomp_timer]") free(flash_mem); #endif } -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...) -#endif // !DISABLED_FOR_TARGETS(ESP32C3) +#endif // __riscv diff --git a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_inst.c b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_inst.c index ca96b377cf..9f5d0e281f 100644 --- a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_inst.c +++ b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_inst.c @@ -23,7 +23,7 @@ #define CACHE_WAYS 8 #define CACHE_LINE_SIZE 32 #define CACHE_SIZE (1 << 13) -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2 #define CACHE_WAYS 8 #define CACHE_LINE_SIZE 32 #define CACHE_SIZE (1 << 14)