From 0b47e173e6cf55fac13f60979d5504796e0c841a Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Mon, 17 Oct 2022 14:12:18 +0800 Subject: [PATCH 1/3] ci: bypass test script check for bringup targets --- tools/ci/check_build_test_rules.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/ci/check_build_test_rules.py b/tools/ci/check_build_test_rules.py index 0d5fd02a81..83b64d8f5b 100755 --- a/tools/ci/check_build_test_rules.py +++ b/tools/ci/check_build_test_rules.py @@ -273,6 +273,9 @@ def check_test_scripts( if actual_verified_targets == _app.verified_targets: return True + elif actual_verified_targets == sorted(_app.verified_targets + bypass_check_test_targets or []): + print(f'WARNING: bypass test script check on {_app.app_dir} for targets {bypass_check_test_targets} ') + return True if_clause = f'IDF_TARGET in [{", ".join([doublequote(target) for target in sorted(set(_app.verified_targets) - set(actual_verified_targets))])}]' From 2557e24a28756329f8750e4a4acde1eaf66fcf2a Mon Sep 17 00:00:00 2001 From: Song Ruo Jing Date: Thu, 27 Oct 2022 18:55:07 +0800 Subject: [PATCH 2/3] ci: Enable esp32c6 example, test_apps, and unit tests CI build stage --- .gitlab/ci/build.yml | 48 +++++++ .gitlab/ci/default-build-test-rules.yml | 13 +- .gitlab/ci/dependencies/dependencies.yml | 1 + .gitlab/ci/rules.yml | 119 +++++++++++++++ components/app_update/.build-test-rules.yml | 7 + components/driver/.build-test-rules.yml | 9 ++ components/driver/test/test_common_spi.c | 2 + components/driver/test/test_i2c.c | 2 + components/driver/test/test_ledc.c | 2 + components/driver/test/test_spi_bus_lock.c | 4 +- components/driver/test/test_spi_master.c | 8 +- components/driver/test/test_spi_sio.c | 2 + components/driver/test/test_spi_slave.c | 2 +- components/driver/test/test_spi_slave_hd.c | 3 + components/driver/test_apps/gpio/README.md | 4 +- components/driver/test_apps/gptimer/README.md | 4 +- .../test_apps/i2s_test_apps/i2s/README.md | 4 +- .../test_apps/i2s_test_apps/i2s_tdm/README.md | 4 +- .../i2s_test_apps/legacy_i2s_driver/README.md | 4 +- .../test_apps/legacy_mcpwm_driver/README.md | 4 +- .../test_apps/legacy_rmt_driver/README.md | 4 +- .../test_apps/legacy_timer_driver/README.md | 4 +- components/driver/test_apps/mcpwm/README.md | 4 +- .../test_apps/mcpwm/main/test_mcpwm_iram.c | 2 +- .../driver/test_apps/pulse_cnt/README.md | 4 +- .../test_apps/pulse_cnt/pytest_pulse_cnt.py | 1 + components/driver/test_apps/rmt/README.md | 4 +- components/driver/test_apps/sdm/README.md | 4 +- components/efuse/test_apps/README.md | 4 +- components/esp_adc/.build-test-rules.yml | 7 + components/esp_lcd/.build-test-rules.yml | 12 ++ components/esp_netif/.build-test-rules.yml | 4 + components/esp_pm/Kconfig | 5 +- components/esp_system/.build-test-rules.yml | 5 + 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 +- components/idf_test/include/esp32c6/.gitkeep | 0 .../include/esp32c6/idf_performance_target.h | 7 + components/lwip/test_apps/README.md | 4 +- components/newlib/.build-test-rules.yml | 7 + components/spi_flash/.build-test-rules.yml | 6 + .../spi_flash/test/test_cache_disabled.c | 2 +- components/spi_flash/test/test_esp_flash.c | 2 + .../test_apps/flash_encryption/README.md | 4 +- components/spiffs/test_apps/README.md | 4 +- conftest.py | 2 +- .../cmake/idf_as_lib/CMakeLists.txt | 2 +- .../build_system/cmake/idf_as_lib/README.md | 4 +- .../cmake/idf_as_lib/build-esp32c6.sh | 1 + .../cmake/idf_as_lib/run-esp32c6.sh | 1 + examples/cxx/.build-test-rules.yml | 21 ++- 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_i2c.cpp | 6 +- examples/cxx/pthread/README.md | 4 +- examples/cxx/rtti/README.md | 4 +- examples/ethernet/.build-test-rules.yml | 16 +++ examples/ethernet/basic/README.md | 4 +- examples/get-started/.build-test-rules.yml | 5 + examples/get-started/blink/README.md | 4 +- examples/get-started/hello_world/README.md | 4 +- .../hello_world/pytest_hello_world.py | 1 + examples/get-started/sample_project/README.md | 4 +- examples/mesh/.build-test-rules.yml | 4 +- examples/network/.build-test-rules.yml | 4 + examples/network/bridge/README.md | 4 +- examples/network/network_tests/README.md | 4 +- examples/network/vlan_support/README.md | 4 +- examples/openthread/.build-test-rules.yml | 4 +- examples/peripherals/.build-test-rules.yml | 112 ++++++++++++++- .../peripherals/gpio/generic_gpio/README.md | 4 +- .../i2s/i2s_basic/i2s_std/README.md | 4 +- .../i2s/i2s_basic/i2s_tdm/README.md | 4 +- .../mcpwm/mcpwm_bdc_speed_control/README.md | 4 +- .../mcpwm/mcpwm_bldc_hall_control/README.md | 4 +- .../mcpwm/mcpwm_capture_hc_sr04/README.md | 4 +- .../mcpwm/mcpwm_servo_control/README.md | 4 +- .../peripherals/mcpwm/mcpwm_sync/README.md | 4 +- .../peripherals/pcnt/rotary_encoder/README.md | 4 +- .../rotary_encoder/pytest_rotary_encoder.py | 1 + examples/peripherals/rmt/dshot_esc/README.md | 4 +- .../rmt/ir_nec_transceiver/README.md | 4 +- examples/peripherals/rmt/led_strip/README.md | 4 +- .../peripherals/rmt/musical_buzzer/README.md | 4 +- .../peripherals/rmt/onewire_ds18b20/README.md | 4 +- .../peripherals/rmt/stepper_motor/README.md | 4 +- examples/peripherals/sigma_delta/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 +- .../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 | 136 +++++++++++++----- examples/protocols/cbor/README.md | 4 +- .../protocols/sockets/non_blocking/README.md | 4 +- examples/provisioning/.build-test-rules.yml | 4 + examples/storage/.build-test-rules.yml | 8 +- .../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 | 39 +++-- 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 +- .../system/freertos/real_time_stats/README.md | 4 +- examples/system/gcov/README.md | 4 +- examples/system/gdbstub/README.md | 4 +- examples/system/heap_task_tracking/README.md | 4 +- examples/system/ota/otatool/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 +- examples/system/unit_test/README.md | 4 +- examples/wifi/.build-test-rules.yml | 12 +- examples/zigbee/.build-test-rules.yml | 4 +- pytest.ini | 3 +- tools/ci/test_build_system_cmake.sh | 2 +- tools/test_apps/.build-test-rules.yml | 28 +++- .../build_system/embed_test/README.md | 4 +- .../build_system/ldalign_test/README.md | 4 +- .../build_system/ldgen_test/README.md | 4 +- .../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 +- .../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 +- tools/test_apps/system/panic/README.md | 4 +- tools/test_apps/system/startup/README.md | 4 +- .../system/startup/pytest_startup.py | 1 + .../test_utils/test/ccomp_timer_test_data.c | 2 +- .../test_utils/test/ccomp_timer_test_inst.c | 2 +- 157 files changed, 822 insertions(+), 293 deletions(-) create mode 100644 components/app_update/.build-test-rules.yml create mode 100644 components/esp_adc/.build-test-rules.yml delete mode 100644 components/idf_test/include/esp32c6/.gitkeep create mode 100644 components/idf_test/include/esp32c6/idf_performance_target.h create mode 100644 components/newlib/.build-test-rules.yml create mode 120000 examples/build_system/cmake/idf_as_lib/build-esp32c6.sh create mode 120000 examples/build_system/cmake/idf_as_lib/run-esp32c6.sh create mode 100644 examples/get-started/.build-test-rules.yml diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 11fc00481b..5820b6fa90 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -171,6 +171,14 @@ build_pytest_components_esp32h2: IDF_TARGET: esp32h2 TEST_DIR: components +build_pytest_examples_esp32c6: + extends: + - .build_pytest_template + - .rules:build:example_test-esp32c6 + variables: + IDF_TARGET: esp32c6 + TEST_DIR: examples + build_pytest_components_esp32: extends: - .build_pytest_template @@ -215,6 +223,14 @@ build_pytest_components_esp32c2: IDF_TARGET: esp32c2 TEST_DIR: components +build_pytest_components_esp32c6: + extends: + - .build_pytest_template + - .rules:build:component_ut-esp32c6 + variables: + IDF_TARGET: esp32c6 + TEST_DIR: components + build_non_test_components_apps: extends: - .build_cmake_template @@ -293,6 +309,14 @@ build_pytest_test_apps_esp32c2: IDF_TARGET: esp32c2 TEST_DIR: tools/test_apps +build_pytest_test_apps_esp32c6: + extends: + - .build_pytest_test_apps_template + - .rules:build:custom_test-esp32c6 + variables: + IDF_TARGET: esp32c6 + TEST_DIR: tools/test_apps + .build_template_app_template: extends: - .build_template @@ -450,6 +474,13 @@ build_esp_idf_tests_cmake_esp32c3: variables: IDF_TARGET: esp32c3 +build_esp_idf_tests_cmake_esp32c6: + extends: + - .build_esp_idf_tests_cmake_template + - .rules:build:unit_test-esp32c6 + variables: + IDF_TARGET: esp32c6 + build_examples_cmake_esp32: extends: - .build_cmake_template @@ -503,6 +534,15 @@ build_examples_cmake_esp32h2: IDF_TARGET: esp32h2 TEST_DIR: examples +build_examples_cmake_esp32c6: + extends: + - .build_cmake_template + - .rules:build:example_test-esp32c6 + parallel: 2 + variables: + IDF_TARGET: esp32c6 + TEST_DIR: examples + build_test_apps_esp32: extends: - .build_cmake_template @@ -547,6 +587,14 @@ build_test_apps_esp32c2: IDF_TARGET: esp32c2 TEST_DIR: tools/test_apps +build_test_apps_esp32c6: + extends: + - .build_cmake_template + - .rules:build:custom_test-esp32c6 + variables: + IDF_TARGET: esp32c6 + TEST_DIR: tools/test_apps + .test_build_system_template: stage: host_test extends: diff --git a/.gitlab/ci/default-build-test-rules.yml b/.gitlab/ci/default-build-test-rules.yml index bc9930d069..04f16f3667 100644 --- a/.gitlab/ci/default-build-test-rules.yml +++ b/.gitlab/ci/default-build-test-rules.yml @@ -6,14 +6,11 @@ # suppress the check_build_test_rules check-test-script warnings for the specified targets # # This file should ONLY be used during bringup. Should be reset to empty after the bringup process -# -# Take esp32c6 as an example: -# -#extra_default_build_targets: -# - esp32c6 -# -#bypass_check_test_targets: -# - esp32c6 +extra_default_build_targets: + - esp32c6 + +bypass_check_test_targets: + - esp32c6 # # These lines would # - enable the README.md check for esp32c6. Don't forget to add the build jobs in .gitlab/ci/build.yml diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index d3bcd1e6e8..1ff08f56ec 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -5,6 +5,7 @@ - esp32c3 - esp32h2 - esp32c2 + - esp32c6 .target_test: &target_test - example_test diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 708442fccc..1c0a4b2505 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -386,6 +386,9 @@ .if-label-component_ut_esp32c3: &if-label-component_ut_esp32c3 if: '$BOT_LABEL_COMPONENT_UT_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32c3(?:,[^,\n\r]+)*$/i' +.if-label-component_ut_esp32c6: &if-label-component_ut_esp32c6 + if: '$BOT_LABEL_COMPONENT_UT_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32c6(?:,[^,\n\r]+)*$/i' + .if-label-component_ut_esp32h2: &if-label-component_ut_esp32h2 if: '$BOT_LABEL_COMPONENT_UT_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32h2(?:,[^,\n\r]+)*$/i' @@ -407,6 +410,9 @@ .if-label-custom_test_esp32c3: &if-label-custom_test_esp32c3 if: '$BOT_LABEL_CUSTOM_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32c3(?:,[^,\n\r]+)*$/i' +.if-label-custom_test_esp32c6: &if-label-custom_test_esp32c6 + if: '$BOT_LABEL_CUSTOM_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32c6(?:,[^,\n\r]+)*$/i' + .if-label-custom_test_esp32h2: &if-label-custom_test_esp32h2 if: '$BOT_LABEL_CUSTOM_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32h2(?:,[^,\n\r]+)*$/i' @@ -431,6 +437,9 @@ .if-label-example_test_esp32c3: &if-label-example_test_esp32c3 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32c3(?:,[^,\n\r]+)*$/i' +.if-label-example_test_esp32c6: &if-label-example_test_esp32c6 + if: '$BOT_LABEL_EXAMPLE_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32c6(?:,[^,\n\r]+)*$/i' + .if-label-example_test_esp32h2: &if-label-example_test_esp32h2 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32h2(?:,[^,\n\r]+)*$/i' @@ -482,6 +491,9 @@ .if-label-unit_test_esp32c3: &if-label-unit_test_esp32c3 if: '$BOT_LABEL_UNIT_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32c3(?:,[^,\n\r]+)*$/i' +.if-label-unit_test_esp32c6: &if-label-unit_test_esp32c6 + if: '$BOT_LABEL_UNIT_TEST_ESP32C6 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32c6(?:,[^,\n\r]+)*$/i' + .if-label-unit_test_esp32h2: &if-label-unit_test_esp32h2 if: '$BOT_LABEL_UNIT_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32h2(?:,[^,\n\r]+)*$/i' @@ -520,6 +532,7 @@ - <<: *if-label-component_ut_esp32 - <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c3 + - <<: *if-label-component_ut_esp32c6 - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 @@ -529,6 +542,7 @@ - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 + - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 @@ -615,6 +629,30 @@ - <<: *if-dev-push changes: *patterns-target_test-i154 +.rules:build:component_ut-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32c6 + - <<: *if-label-target_test + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c6 + - <<: *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-adc + - <<: *if-dev-push + changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-i154 + .rules:build:component_ut-esp32h2: rules: - <<: *if-revert-branch @@ -697,6 +735,7 @@ - <<: *if-label-custom_test_esp32 - <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c3 + - <<: *if-label-custom_test_esp32c6 - <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 @@ -772,6 +811,26 @@ - <<: *if-dev-push changes: *patterns-target_test-i154 +.rules:build:custom_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c6 + - <<: *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-i154 + .rules:build:custom_test-esp32s2: rules: - <<: *if-revert-branch @@ -839,6 +898,7 @@ - <<: *if-label-example_test_esp32 - <<: *if-label-example_test_esp32c2 - <<: *if-label-example_test_esp32c3 + - <<: *if-label-example_test_esp32c6 - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 @@ -954,6 +1014,36 @@ - <<: *if-dev-push changes: *patterns-target_test-i154 +.rules:build:example_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c6 + - <<: *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-usb + - <<: *if-dev-push + changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-i154 + .rules:build:example_test-esp32h2: rules: - <<: *if-revert-branch @@ -1083,6 +1173,7 @@ - <<: *if-label-component_ut_esp32 - <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c3 + - <<: *if-label-component_ut_esp32c6 - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 @@ -1090,6 +1181,7 @@ - <<: *if-label-custom_test_esp32 - <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c3 + - <<: *if-label-custom_test_esp32c6 - <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 @@ -1097,6 +1189,7 @@ - <<: *if-label-example_test_esp32 - <<: *if-label-example_test_esp32c2 - <<: *if-label-example_test_esp32c3 + - <<: *if-label-example_test_esp32c6 - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 @@ -1108,6 +1201,7 @@ - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 + - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 @@ -1159,6 +1253,7 @@ - <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 + - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 @@ -1248,6 +1343,30 @@ - <<: *if-dev-push changes: *patterns-unit_test-spi_multi +.rules:build:unit_test-esp32c6: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-target_test + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c6 + - <<: *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-i154 + - <<: *if-dev-push + changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-sdio + - <<: *if-dev-push + changes: *patterns-unit_test-spi_multi + .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 new file mode 100644 index 0000000000..656094c062 --- /dev/null +++ b/components/app_update/.build-test-rules.yml @@ -0,0 +1,7 @@ +# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps + +components/app_update/test_apps: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: false + reason: target esp32c6 is not supported yet diff --git a/components/driver/.build-test-rules.yml b/components/driver/.build-test-rules.yml index 008356ddad..f5ec2a0dfd 100644 --- a/components/driver/.build-test-rules.yml +++ b/components/driver/.build-test-rules.yml @@ -20,6 +20,12 @@ components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac: disable: - if: SOC_I2S_SUPPORTS_ADC_DAC != 1 +components/driver/test_apps/legacy_adc_driver: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + components/driver/test_apps/legacy_mcpwm_driver: disable: - if: SOC_MCPWM_SUPPORTED != 1 @@ -27,6 +33,9 @@ components/driver/test_apps/legacy_mcpwm_driver: components/driver/test_apps/legacy_pcnt_driver: disable: - if: SOC_PCNT_SUPPORTED != 1 + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: test depends on ledc to be supported on esp32c6 components/driver/test_apps/legacy_rmt_driver: disable: diff --git a/components/driver/test/test_common_spi.c b/components/driver/test/test_common_spi.c index 0a3b7b940f..69ebc733c8 100644 --- a/components/driver/test/test_common_spi.c +++ b/components/driver/test/test_common_spi.c @@ -11,6 +11,7 @@ #include "esp_rom_gpio.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) int test_freq_default[]=TEST_FREQ_DEFAULT(); const char MASTER_TAG[] = "test_master"; @@ -249,3 +250,4 @@ void get_tx_buffer(uint32_t seed, uint8_t *master_send_buf, uint8_t *slave_send_ master_send_buf[i] = rand() % 256; } } +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) diff --git a/components/driver/test/test_i2c.c b/components/driver/test/test_i2c.c index 0dc6324b1f..7a792e9b17 100644 --- a/components/driver/test/test_i2c.c +++ b/components/driver/test/test_i2c.c @@ -25,6 +25,7 @@ #include "hal/gpio_hal.h" #include "hal/uart_ll.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) #if SOC_I2C_SUPPORT_SLAVE // i2c test can't work without slave #define DATA_LENGTH 512 /*!= 2) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) /******************************************************************************** * Test SIO Master * SIO Slave is not suported, and one unit test is limited to one feature, so,,, @@ -334,3 +335,4 @@ void test_slave_run(void) } TEST_CASE_MULTIPLE_DEVICES("SPI_Master:Test_SIO_Mode_Multi_Board", "[spi_ms][test_env=Example_SPI_Multi_device]", test_master_run, test_slave_run); +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) diff --git a/components/driver/test/test_spi_slave.c b/components/driver/test/test_spi_slave.c index fa0a1a6188..e3d8fee63a 100644 --- a/components/driver/test/test_spi_slave.c +++ b/components/driver/test/test_spi_slave.c @@ -261,7 +261,7 @@ TEST_CASE("test slave send unaligned","[spi]") #endif // #if (TEST_SPI_PERIPH_NUM >= 2) -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6) #if (TEST_SPI_PERIPH_NUM == 1) //These tests are for chips which only have 1 SPI controller /******************************************************************************** diff --git a/components/driver/test/test_spi_slave_hd.c b/components/driver/test/test_spi_slave_hd.c index 9093644945..617253f8b0 100644 --- a/components/driver/test/test_spi_slave_hd.c +++ b/components/driver/test/test_spi_slave_hd.c @@ -594,6 +594,7 @@ TEST_CASE("test spi slave hd segment mode, master too long", "[spi][spi_slv_hd]" #endif //#if (TEST_SPI_PERIPH_NUM >= 2) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) #if (TEST_SPI_PERIPH_NUM == 1) //These tests are for chips which only have 1 SPI controller /******************************************************************************** @@ -883,4 +884,6 @@ TEST_CASE_MULTIPLE_DEVICES("SPI quad hd test ", "[spi_ms][test_env=Example_SPI_Q #endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2) +#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) + #endif //SOC_SPI_SUPPORT_SLAVE_HD_VER2 diff --git a/components/driver/test_apps/gpio/README.md b/components/driver/test_apps/gpio/README.md index b5be4985c5..7e7523ec85 100644 --- a/components/driver/test_apps/gpio/README.md +++ b/components/driver/test_apps/gpio/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-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/gptimer/README.md b/components/driver/test_apps/gptimer/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/i2s_test_apps/i2s/README.md b/components/driver/test_apps/i2s_test_apps/i2s/README.md index 497a93ba72..6f026d8e9e 100644 --- a/components/driver/test_apps/i2s_test_apps/i2s/README.md +++ b/components/driver/test_apps/i2s_test_apps/i2s/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/i2s_test_apps/i2s_tdm/README.md b/components/driver/test_apps/i2s_test_apps/i2s_tdm/README.md index 0eb37997ef..721d4348d7 100644 --- a/components/driver/test_apps/i2s_test_apps/i2s_tdm/README.md +++ b/components/driver/test_apps/i2s_test_apps/i2s_tdm/README.md @@ -1,3 +1,3 @@ -| Supported Targets | ESP32-C3 | ESP32-S3 | -| ----------------- | -------- | -------- | +| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-S3 | +| ----------------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md index 497a93ba72..6f026d8e9e 100644 --- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md +++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/legacy_mcpwm_driver/README.md b/components/driver/test_apps/legacy_mcpwm_driver/README.md index 5ab630aafd..7e3b67329a 100644 --- a/components/driver/test_apps/legacy_mcpwm_driver/README.md +++ b/components/driver/test_apps/legacy_mcpwm_driver/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-S3 | -| ----------------- | ----- | -------- | +| Supported Targets | ESP32 | ESP32-C6 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | diff --git a/components/driver/test_apps/legacy_rmt_driver/README.md b/components/driver/test_apps/legacy_rmt_driver/README.md index 497a93ba72..6f026d8e9e 100644 --- a/components/driver/test_apps/legacy_rmt_driver/README.md +++ b/components/driver/test_apps/legacy_rmt_driver/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/mcpwm/README.md b/components/driver/test_apps/mcpwm/README.md index 5ab630aafd..7e3b67329a 100644 --- a/components/driver/test_apps/mcpwm/README.md +++ b/components/driver/test_apps/mcpwm/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-S3 | -| ----------------- | ----- | -------- | +| Supported Targets | ESP32 | ESP32-C6 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | diff --git a/components/driver/test_apps/mcpwm/main/test_mcpwm_iram.c b/components/driver/test_apps/mcpwm/main/test_mcpwm_iram.c index 6cd422e5c3..0e6057eb65 100644 --- a/components/driver/test_apps/mcpwm/main/test_mcpwm_iram.c +++ b/components/driver/test_apps/mcpwm/main/test_mcpwm_iram.c @@ -40,7 +40,7 @@ TEST_CASE("mcpwm_capture_iram_safe", "[mcpwm]") printf("install mcpwm capture timer\r\n"); mcpwm_cap_timer_handle_t cap_timer = NULL; mcpwm_capture_timer_config_t cap_timer_config = { - .clk_src = MCPWM_CAPTURE_CLK_SRC_APB, + .clk_src = MCPWM_CAPTURE_CLK_SRC_DEFAULT, .group_id = 0, }; TEST_ESP_OK(mcpwm_new_capture_timer(&cap_timer_config, &cap_timer)); diff --git a/components/driver/test_apps/pulse_cnt/README.md b/components/driver/test_apps/pulse_cnt/README.md index b88a9825d9..40eac280e6 100644 --- a/components/driver/test_apps/pulse_cnt/README.md +++ b/components/driver/test_apps/pulse_cnt/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/pulse_cnt/pytest_pulse_cnt.py b/components/driver/test_apps/pulse_cnt/pytest_pulse_cnt.py index f127535505..b8d40cf4d1 100644 --- a/components/driver/test_apps/pulse_cnt/pytest_pulse_cnt.py +++ b/components/driver/test_apps/pulse_cnt/pytest_pulse_cnt.py @@ -8,6 +8,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s2 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/driver/test_apps/rmt/README.md b/components/driver/test_apps/rmt/README.md index 497a93ba72..6f026d8e9e 100644 --- a/components/driver/test_apps/rmt/README.md +++ b/components/driver/test_apps/rmt/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/driver/test_apps/sdm/README.md b/components/driver/test_apps/sdm/README.md index 497a93ba72..6f026d8e9e 100644 --- a/components/driver/test_apps/sdm/README.md +++ b/components/driver/test_apps/sdm/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/efuse/test_apps/README.md b/components/efuse/test_apps/README.md index 27995c13b2..cd9be654c0 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_adc/.build-test-rules.yml b/components/esp_adc/.build-test-rules.yml new file mode 100644 index 0000000000..9237324a1a --- /dev/null +++ b/components/esp_adc/.build-test-rules.yml @@ -0,0 +1,7 @@ +# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps + +components/esp_adc/test_apps/adc: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet diff --git a/components/esp_lcd/.build-test-rules.yml b/components/esp_lcd/.build-test-rules.yml index 8df02267ec..951267c53a 100644 --- a/components/esp_lcd/.build-test-rules.yml +++ b/components/esp_lcd/.build-test-rules.yml @@ -1,5 +1,11 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/esp_lcd/test_apps/i2c_lcd: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + components/esp_lcd/test_apps/i80_lcd: disable: - if: SOC_LCD_I80_SUPPORTED != 1 @@ -7,3 +13,9 @@ 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: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet diff --git a/components/esp_netif/.build-test-rules.yml b/components/esp_netif/.build-test-rules.yml index 15f5140e85..4684f184cf 100644 --- a/components/esp_netif/.build-test-rules.yml +++ b/components/esp_netif/.build-test-rules.yml @@ -1,6 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps components/esp_netif/test_apps: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32s2" temporary: true diff --git a/components/esp_pm/Kconfig b/components/esp_pm/Kconfig index d9eefd76e5..15dee40de2 100644 --- a/components/esp_pm/Kconfig +++ b/components/esp_pm/Kconfig @@ -2,7 +2,10 @@ menu "Power Management" config PM_ENABLE bool "Support for power management" # SMP FreeRTOS currently does not support power management IDF-4997 - depends on !FREERTOS_SMP + # ESP32C6 currently does not support power management IDF-5347 + # 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__ default n help If enabled, application is compiled with support for power management. diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml index 723aea0b55..e89e6d7681 100644 --- a/components/esp_system/.build-test-rules.yml +++ b/components/esp_system/.build-test-rules.yml @@ -1,5 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/esp_system/test_apps/rtc_8md256: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet components/esp_system/test_apps/rtc_power_modes: enable: - if: IDF_TARGET == "esp32s3" diff --git a/components/fatfs/.build-test-rules.yml b/components/fatfs/.build-test-rules.yml index c879f1132b..0ce3d9fd53 100644 --- a/components/fatfs/.build-test-rules.yml +++ b/components/fatfs/.build-test-rules.yml @@ -1,6 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps components/fatfs/test_apps/sdcard: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET in ["esp32s3", "esp32c2"] temporary: true diff --git a/components/fatfs/test_apps/flash_ro/README.md b/components/fatfs/test_apps/flash_ro/README.md index dd48f82c4d..6bcc4aa63f 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 1a530524e6..3e098284e1 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/idf_test/include/esp32c6/.gitkeep b/components/idf_test/include/esp32c6/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/idf_test/include/esp32c6/idf_performance_target.h b/components/idf_test/include/esp32c6/idf_performance_target.h new file mode 100644 index 0000000000..e9b4a08c59 --- /dev/null +++ b/components/idf_test/include/esp32c6/idf_performance_target.h @@ -0,0 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#pragma once diff --git a/components/lwip/test_apps/README.md b/components/lwip/test_apps/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/newlib/.build-test-rules.yml b/components/newlib/.build-test-rules.yml new file mode 100644 index 0000000000..554a89aa6c --- /dev/null +++ b/components/newlib/.build-test-rules.yml @@ -0,0 +1,7 @@ +# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps + +components/newlib/test_apps: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet diff --git a/components/spi_flash/.build-test-rules.yml b/components/spi_flash/.build-test-rules.yml index 1521233f54..eaf8ff50ff 100644 --- a/components/spi_flash/.build-test-rules.yml +++ b/components/spi_flash/.build-test-rules.yml @@ -5,6 +5,12 @@ components/spi_flash/host_test/partition_api_test: - if: IDF_TARGET == "linux" reason: only test on linux +components/spi_flash/test_apps/esp_flash: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + components/spi_flash/test_apps/flash_encryption: disable_test: - if: IDF_TARGET in ["esp32c2", "esp32s2"] diff --git a/components/spi_flash/test/test_cache_disabled.c b/components/spi_flash/test/test_cache_disabled.c index a8467e54df..5ea6c8efb6 100644 --- a/components/spi_flash/test/test_cache_disabled.c +++ b/components/spi_flash/test/test_cache_disabled.c @@ -82,7 +82,7 @@ static void IRAM_ATTR cache_access_test_func(void* arg) #if CONFIG_IDF_TARGET_ESP32 #define CACHE_ERROR_REASON "Cache disabled,SW_RESET" -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32H2 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6 #define CACHE_ERROR_REASON "Cache error,RTC_SW_CPU_RST" #elif CONFIG_IDF_TARGET_ESP32S3 #define CACHE_ERROR_REASON "Cache disabled,RTC_SW_CPU_RST" diff --git a/components/spi_flash/test/test_esp_flash.c b/components/spi_flash/test/test_esp_flash.c index 52ac167001..72f2f3abb8 100644 --- a/components/spi_flash/test/test_esp_flash.c +++ b/components/spi_flash/test/test_esp_flash.c @@ -123,6 +123,7 @@ #define HSPI_PIN_NUM_CS FSPI_PIN_NUM_CS #endif +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) #define TEST_CONFIG_NUM (sizeof(config_list)/sizeof(flashtest_config_t)) typedef void (*flash_test_func_t)(const esp_partition_t *part); @@ -639,3 +640,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) diff --git a/components/spi_flash/test_apps/flash_encryption/README.md b/components/spi_flash/test_apps/flash_encryption/README.md index b0f1d3c54f..2872ceed56 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | ## Prepare runner diff --git a/components/spiffs/test_apps/README.md b/components/spiffs/test_apps/README.md index bb787eea5f..f69f732a4e 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | This is a test app for spiffs component. diff --git a/conftest.py b/conftest.py index 5a16421217..f3cabb6d5f 100644 --- a/conftest.py +++ b/conftest.py @@ -48,7 +48,7 @@ except ImportError: SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2'] -PREVIEW_TARGETS = ['linux', 'esp32h2'] +PREVIEW_TARGETS = ['esp32h2', 'esp32c6'] # this PREVIEW_TARGETS excludes 'linux' target DEFAULT_SDKCONFIG = 'default' diff --git a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt index d9be86955e..5772df0e80 100644 --- a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt +++ b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) project(idf_as_lib C) -set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp32c2") +set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp32c2" "esp32c6") if("${TARGET}" IN_LIST targets) # Include for ESP-IDF build system functions diff --git a/examples/build_system/cmake/idf_as_lib/README.md b/examples/build_system/cmake/idf_as_lib/README.md index 43339b7d41..0cc5619a9f 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 | -| ----------------- | ----- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Using ESP-IDF in Custom CMake Projects diff --git a/examples/build_system/cmake/idf_as_lib/build-esp32c6.sh b/examples/build_system/cmake/idf_as_lib/build-esp32c6.sh new file mode 120000 index 0000000000..c07a74de4f --- /dev/null +++ b/examples/build_system/cmake/idf_as_lib/build-esp32c6.sh @@ -0,0 +1 @@ +build.sh \ No newline at end of file diff --git a/examples/build_system/cmake/idf_as_lib/run-esp32c6.sh b/examples/build_system/cmake/idf_as_lib/run-esp32c6.sh new file mode 120000 index 0000000000..cde8585ed4 --- /dev/null +++ b/examples/build_system/cmake/idf_as_lib/run-esp32c6.sh @@ -0,0 +1 @@ +run-esp32.sh \ No newline at end of file diff --git a/examples/cxx/.build-test-rules.yml b/examples/cxx/.build-test-rules.yml index 2680c11384..459e2b4135 100644 --- a/examples/cxx/.build-test-rules.yml +++ b/examples/cxx/.build-test-rules.yml @@ -12,6 +12,18 @@ examples/cxx/experimental/esp_modem_cxx: temporary: true reason: the other targets are not tested yet +examples/cxx/experimental/esp_mqtt_cxx/ssl: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + +examples/cxx/experimental/esp_mqtt_cxx/tcp: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + examples/cxx/experimental/experimental_cpp_component/host_test: enable: - if: IDF_TARGET == "linux" @@ -19,21 +31,22 @@ examples/cxx/experimental/experimental_cpp_component/host_test: examples/cxx/experimental/simple_i2c_rw_example: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/cxx/experimental/simple_spi_rw_example: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/cxx/pthread: disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3"] temporary: true reason: lack of runners + examples/cxx/rtti: disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3"] diff --git a/examples/cxx/exceptions/README.md b/examples/cxx/exceptions/README.md index 18fd7e3a40..4c02b08fde 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 0e145f1f52..92f3e36c4f 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 aa2c607779..87c6550c12 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 c2350565ef..3b557c5cb3 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 50cc2ab6f2..1d6b97c1b0 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 83f485be41..9afbfb13cc 100644 --- a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp @@ -27,6 +27,8 @@ constexpr std::array INVALID_GPIOS = {22, 23, 24, 25}; constexpr std::array INVALID_GPIOS = {}; #elif CONFIG_IDF_TARGET_ESP32C2 constexpr std::array INVALID_GPIOS = {}; +#elif CONFIG_IDF_TARGET_ESP32C6 +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 b9b62162f9..ad350fd3ae 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 +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 #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_i2c.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp index 195c5476d5..2c43a49b5d 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: dut.expect_exact('install pcnt unit') diff --git a/examples/peripherals/rmt/dshot_esc/README.md b/examples/peripherals/rmt/dshot_esc/README.md index 468f962e14..a44e1d3a6d 100644 --- a/examples/peripherals/rmt/dshot_esc/README.md +++ b/examples/peripherals/rmt/dshot_esc/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # RMT Infinite Loop Transmit Example -- Dshot ESC (Electronic Speed Controller) (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/peripherals/rmt/ir_nec_transceiver/README.md b/examples/peripherals/rmt/ir_nec_transceiver/README.md index e9ea4aa76b..2cc5dcc6d1 100644 --- a/examples/peripherals/rmt/ir_nec_transceiver/README.md +++ b/examples/peripherals/rmt/ir_nec_transceiver/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # IR NEC Encoding and Decoding Example (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/peripherals/rmt/led_strip/README.md b/examples/peripherals/rmt/led_strip/README.md index 4d69337a46..fbdf212e01 100644 --- a/examples/peripherals/rmt/led_strip/README.md +++ b/examples/peripherals/rmt/led_strip/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # RMT Transmit Example -- LED Strip (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/peripherals/rmt/musical_buzzer/README.md b/examples/peripherals/rmt/musical_buzzer/README.md index 0d6d0ad43e..c23e95cb1a 100644 --- a/examples/peripherals/rmt/musical_buzzer/README.md +++ b/examples/peripherals/rmt/musical_buzzer/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | -------- | -------- | -------- | +| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | -------- | -------- | -------- | -------- | # RMT Transmit Loop Count Example -- Musical Buzzer diff --git a/examples/peripherals/rmt/onewire_ds18b20/README.md b/examples/peripherals/rmt/onewire_ds18b20/README.md index cb9eb18c33..869898577e 100644 --- a/examples/peripherals/rmt/onewire_ds18b20/README.md +++ b/examples/peripherals/rmt/onewire_ds18b20/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # RMT Transmit & Receive Example -- 1-Wire bus diff --git a/examples/peripherals/rmt/stepper_motor/README.md b/examples/peripherals/rmt/stepper_motor/README.md index cc66f2500a..6bb29a2579 100644 --- a/examples/peripherals/rmt/stepper_motor/README.md +++ b/examples/peripherals/rmt/stepper_motor/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32-S3 | -| ----------------- | -------- | +| Supported Targets | ESP32-C6 | ESP32-S3 | +| ----------------- | -------- | -------- | # RMT Based Stepper Motor Smooth Controller diff --git a/examples/peripherals/sigma_delta/README.md b/examples/peripherals/sigma_delta/README.md index fee058866e..17da05e942 100644 --- a/examples/peripherals/sigma_delta/README.md +++ b/examples/peripherals/sigma_delta/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Sigma Delta Modulation Example diff --git a/examples/peripherals/timer_group/gptimer/README.md b/examples/peripherals/timer_group/gptimer/README.md index ab49ceb79c..24a65bcf3a 100644 --- a/examples/peripherals/timer_group/gptimer/README.md +++ b/examples/peripherals/timer_group/gptimer/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Example: General Purpose Timer diff --git a/examples/peripherals/timer_group/legacy_driver/README.md b/examples/peripherals/timer_group/legacy_driver/README.md index 0ec4f5852d..8b9b3a40fb 100644 --- a/examples/peripherals/timer_group/legacy_driver/README.md +++ b/examples/peripherals/timer_group/legacy_driver/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Example: General Purpose Timer diff --git a/examples/peripherals/uart/nmea0183_parser/README.md b/examples/peripherals/uart/nmea0183_parser/README.md index b28fc6e364..04010a6967 100644 --- a/examples/peripherals/uart/nmea0183_parser/README.md +++ b/examples/peripherals/uart/nmea0183_parser/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # NMEA Parser Example diff --git a/examples/peripherals/uart/uart_async_rxtxtasks/README.md b/examples/peripherals/uart/uart_async_rxtxtasks/README.md index 36aca7d284..4cbe0a9f0a 100644 --- a/examples/peripherals/uart/uart_async_rxtxtasks/README.md +++ b/examples/peripherals/uart/uart_async_rxtxtasks/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # UART Asynchronous Example with Separate Receive and Transfer Tasks diff --git a/examples/peripherals/uart/uart_events/README.md b/examples/peripherals/uart/uart_events/README.md index 5d121ff648..b5ead37e14 100644 --- a/examples/peripherals/uart/uart_events/README.md +++ b/examples/peripherals/uart/uart_events/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # UART Events Example diff --git a/examples/peripherals/uart/uart_repl/README.md b/examples/peripherals/uart/uart_repl/README.md index d63635913b..669c957ff0 100644 --- a/examples/peripherals/uart/uart_repl/README.md +++ b/examples/peripherals/uart/uart_repl/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # UART REPL Example diff --git a/examples/peripherals/uart/uart_select/README.md b/examples/peripherals/uart/uart_select/README.md index e3301fe043..b9d60bafa3 100644 --- a/examples/peripherals/uart/uart_select/README.md +++ b/examples/peripherals/uart/uart_select/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # UART Select Example diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml index 07ec3ae0aa..e7cad835ff 100644 --- a/examples/protocols/.build-test-rules.yml +++ b/examples/protocols/.build-test-rules.yml @@ -53,59 +53,101 @@ examples/protocols/asio/udp_echo_server: reason: lack of runners examples/protocols/coap_client: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" reason: running this test on single platform is sufficient for coverage examples/protocols/coap_server: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet + +examples/protocols/esp_http_client: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + +examples/protocols/esp_local_ctrl: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet examples/protocols/http2_request: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/http_request: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/http_server: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/https_mbedtls: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners +examples/protocols/https_request: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + examples/protocols/https_server/simple: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners examples/protocols/https_server/wss_server: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners examples/protocols/https_x509_bundle: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners examples/protocols/icmp_echo: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true @@ -113,9 +155,9 @@ examples/protocols/icmp_echo: examples/protocols/l2tap: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -133,15 +175,15 @@ examples/protocols/mdns: examples/protocols/modbus: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/mqtt/ssl: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -153,21 +195,21 @@ examples/protocols/mqtt/ssl_ds: examples/protocols/mqtt/ssl_mutual_auth: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/mqtt/ssl_psk: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/mqtt/tcp: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -175,9 +217,9 @@ examples/protocols/mqtt/tcp: examples/protocols/mqtt/ws: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -185,9 +227,9 @@ examples/protocols/mqtt/ws: examples/protocols/mqtt/wss: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -195,9 +237,9 @@ examples/protocols/mqtt/wss: examples/protocols/mqtt5: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -211,9 +253,9 @@ examples/protocols/slip/slip_udp: examples/protocols/smtp_client: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/sntp: enable: @@ -234,6 +276,10 @@ examples/protocols/sockets/non_blocking: reason: lack of runners examples/protocols/sockets/tcp_client: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" temporary: true @@ -243,28 +289,54 @@ examples/protocols/sockets/tcp_client: examples/protocols/sockets/tcp_client_multi_net: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/protocols/sockets/tcp_server: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners +examples/protocols/sockets/tcp_transport_client: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + examples/protocols/sockets/udp_client: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true reason: lack of runners +examples/protocols/sockets/udp_multicast: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + examples/protocols/sockets/udp_server: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + +examples/protocols/static_ip: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet diff --git a/examples/protocols/cbor/README.md b/examples/protocols/cbor/README.md index 6873996328..1ccd02c659 100644 --- a/examples/protocols/cbor/README.md +++ b/examples/protocols/cbor/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # CBOR Example (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/protocols/sockets/non_blocking/README.md b/examples/protocols/sockets/non_blocking/README.md index 4732336be1..a74f7d0be4 100644 --- a/examples/protocols/sockets/non_blocking/README.md +++ b/examples/protocols/sockets/non_blocking/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # TCP non-blocking client and server examples diff --git a/examples/provisioning/.build-test-rules.yml b/examples/provisioning/.build-test-rules.yml index 2c9fd3875b..29e6cdcccf 100644 --- a/examples/provisioning/.build-test-rules.yml +++ b/examples/provisioning/.build-test-rules.yml @@ -1,6 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps examples/provisioning/wifi_prov_mgr: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" temporary: true diff --git a/examples/storage/.build-test-rules.yml b/examples/storage/.build-test-rules.yml index 2bc1265b3d..745a6443b6 100644 --- a/examples/storage/.build-test-rules.yml +++ b/examples/storage/.build-test-rules.yml @@ -8,9 +8,9 @@ examples/storage/custom_flash_driver: examples/storage/ext_flash_fatfs: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] temporary: true @@ -106,9 +106,9 @@ examples/storage/sd_card/sdmmc: examples/storage/sd_card/sdspi: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET == "esp32s3" temporary: true diff --git a/examples/storage/custom_flash_driver/README.md b/examples/storage/custom_flash_driver/README.md index 0a63b34cbe..b382654a70 100644 --- a/examples/storage/custom_flash_driver/README.md +++ b/examples/storage/custom_flash_driver/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Custom Flash Driver Example diff --git a/examples/storage/fatfsgen/README.md b/examples/storage/fatfsgen/README.md index 2fa3108628..37f1f3b2e9 100644 --- a/examples/storage/fatfsgen/README.md +++ b/examples/storage/fatfsgen/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # FATFS partition generation example diff --git a/examples/storage/nvs_rw_blob/README.md b/examples/storage/nvs_rw_blob/README.md index a52e980793..94928ac3c8 100644 --- a/examples/storage/nvs_rw_blob/README.md +++ b/examples/storage/nvs_rw_blob/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Non-Volatile Storage (NVS) Read and Write Example diff --git a/examples/storage/nvs_rw_value/README.md b/examples/storage/nvs_rw_value/README.md index a52eb2ef19..f96ca49f52 100644 --- a/examples/storage/nvs_rw_value/README.md +++ b/examples/storage/nvs_rw_value/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Non-Volatile Storage (NVS) Read and Write Example diff --git a/examples/storage/nvs_rw_value_cxx/README.md b/examples/storage/nvs_rw_value_cxx/README.md index 14c29c096d..896c13aea2 100644 --- a/examples/storage/nvs_rw_value_cxx/README.md +++ b/examples/storage/nvs_rw_value_cxx/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Non-Volatile Storage (NVS) C++ Read and Write Example diff --git a/examples/storage/partition_api/partition_find/README.md b/examples/storage/partition_api/partition_find/README.md index 9c18ae1409..1483890d6d 100644 --- a/examples/storage/partition_api/partition_find/README.md +++ b/examples/storage/partition_api/partition_find/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Finding Partitions Example diff --git a/examples/storage/partition_api/partition_mmap/README.md b/examples/storage/partition_api/partition_mmap/README.md index 29fda35ec1..dc87fb10c7 100644 --- a/examples/storage/partition_api/partition_mmap/README.md +++ b/examples/storage/partition_api/partition_mmap/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Partition Memory Map Example diff --git a/examples/storage/partition_api/partition_ops/README.md b/examples/storage/partition_api/partition_ops/README.md index ae61c33499..3940d07dc2 100644 --- a/examples/storage/partition_api/partition_ops/README.md +++ b/examples/storage/partition_api/partition_ops/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Partition Read, Write, Erase Example diff --git a/examples/storage/parttool/README.md b/examples/storage/parttool/README.md index 44b3600bdb..22c3bb08df 100644 --- a/examples/storage/parttool/README.md +++ b/examples/storage/parttool/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Partitions Tool Example diff --git a/examples/storage/semihost_vfs/README.md b/examples/storage/semihost_vfs/README.md index 843044e061..75f2db8b9a 100644 --- a/examples/storage/semihost_vfs/README.md +++ b/examples/storage/semihost_vfs/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Semihosting VFS driver example diff --git a/examples/storage/spiffs/README.md b/examples/storage/spiffs/README.md index 3225ccdd2d..055a7a8391 100644 --- a/examples/storage/spiffs/README.md +++ b/examples/storage/spiffs/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # SPIFFS example diff --git a/examples/storage/spiffsgen/README.md b/examples/storage/spiffsgen/README.md index 792d732ea7..06a2d73941 100644 --- a/examples/storage/spiffsgen/README.md +++ b/examples/storage/spiffsgen/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # SPIFFS Image Generation on Build Example diff --git a/examples/storage/wear_levelling/README.md b/examples/storage/wear_levelling/README.md index 7686f336f9..d82afe5b23 100644 --- a/examples/storage/wear_levelling/README.md +++ b/examples/storage/wear_levelling/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Wear levelling example diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index e635728186..e7e1a87e03 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -12,9 +12,9 @@ examples/system/app_trace_to_host: examples/system/console/advanced: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32s2", "esp32s3"] temporary: true @@ -28,9 +28,9 @@ examples/system/console/advanced_usb_cdc: examples/system/console/basic: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet disable_test: - if: IDF_TARGET in ["esp32s2", "esp32s3"] temporary: true @@ -38,9 +38,9 @@ examples/system/console/basic: examples/system/deep_sleep: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/system/efuse: disable_test: @@ -49,6 +49,10 @@ examples/system/efuse: reason: lack of runners examples/system/esp_timer: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true @@ -92,16 +96,26 @@ examples/system/ipc/ipc_isr: examples/system/light_sleep: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/system/ota/advanced_https_ota: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners +examples/system/ota/native_ota_example: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + examples/system/ota/otatool: disable: - if: IDF_TARGET == "esp32c2" @@ -109,12 +123,20 @@ examples/system/ota/otatool: reason: target esp32c2 is not supported yet examples/system/ota/pre_encrypted_ota: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true reason: lack of runners examples/system/ota/simple_ota_example: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET == "esp32c2" temporary: true @@ -195,6 +217,7 @@ examples/system/ulp_riscv/i2c: examples/system/ulp_riscv/uart_print: enable: - if: SOC_RISCV_COPROC_SUPPORTED == 1 + examples/system/xip_from_psram: enable: - if: SOC_SPIRAM_SUPPORTED == 1 diff --git a/examples/system/base_mac_address/README.md b/examples/system/base_mac_address/README.md index 81ead95330..af4737e3b5 100644 --- a/examples/system/base_mac_address/README.md +++ b/examples/system/base_mac_address/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Base MAC Address diff --git a/examples/system/efuse/README.md b/examples/system/efuse/README.md index 23a722c6d7..eb376c0f6f 100644 --- a/examples/system/efuse/README.md +++ b/examples/system/efuse/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # eFuse Example diff --git a/examples/system/esp_event/default_event_loop/README.md b/examples/system/esp_event/default_event_loop/README.md index 59b20dc012..33ee12676c 100644 --- a/examples/system/esp_event/default_event_loop/README.md +++ b/examples/system/esp_event/default_event_loop/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Default Event Loop Example diff --git a/examples/system/esp_event/user_event_loops/README.md b/examples/system/esp_event/user_event_loops/README.md index d75e5ed51b..6be64d3453 100644 --- a/examples/system/esp_event/user_event_loops/README.md +++ b/examples/system/esp_event/user_event_loops/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # User Event Loops Example diff --git a/examples/system/eventfd/README.md b/examples/system/eventfd/README.md index f650299e42..3f5ad957ac 100644 --- a/examples/system/eventfd/README.md +++ b/examples/system/eventfd/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # eventfd example diff --git a/examples/system/freertos/real_time_stats/README.md b/examples/system/freertos/real_time_stats/README.md index f9567e4adb..4f5b511677 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # FreeRTOS Real Time Stats Example diff --git a/examples/system/gcov/README.md b/examples/system/gcov/README.md index 9108c66ada..4f5c92fcdb 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Blink Example With Coverage Info (Gcov) diff --git a/examples/system/gdbstub/README.md b/examples/system/gdbstub/README.md index 504c526027..45f9d2cea0 100644 --- a/examples/system/gdbstub/README.md +++ b/examples/system/gdbstub/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # GDBstub example diff --git a/examples/system/heap_task_tracking/README.md b/examples/system/heap_task_tracking/README.md index 63eeceacff..7a4d610423 100644 --- a/examples/system/heap_task_tracking/README.md +++ b/examples/system/heap_task_tracking/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Heap Task Tracking Example diff --git a/examples/system/ota/otatool/README.md b/examples/system/ota/otatool/README.md index 6b6a047e10..40634e861b 100644 --- a/examples/system/ota/otatool/README.md +++ b/examples/system/ota/otatool/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # OTA Tool Example diff --git a/examples/system/pthread/README.md b/examples/system/pthread/README.md index 3281489249..72320d088e 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Pthread Example diff --git a/examples/system/select/README.md b/examples/system/select/README.md index d78f91a5c2..8bd9c1f255 100644 --- a/examples/system/select/README.md +++ b/examples/system/select/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | 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 cdbbd5b083..e5a56f9a32 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Startup Time Example diff --git a/examples/system/sysview_tracing/README.md b/examples/system/sysview_tracing/README.md index 04dd0f3288..4257ce0df5 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 590e3b56cc..49b764c163 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 e04259d6fc..7f4571a73b 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Task Watchdog Example diff --git a/examples/system/unit_test/README.md b/examples/system/unit_test/README.md index d9ae7ee971..9d76342b62 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Unit Testing diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml index 4c1bd20eca..708adc3fbf 100644 --- a/examples/wifi/.build-test-rules.yml +++ b/examples/wifi/.build-test-rules.yml @@ -2,9 +2,9 @@ examples/wifi: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/wifi/ftm: enable: @@ -13,12 +13,20 @@ examples/wifi/ftm: reason: the other targets are not tested yet examples/wifi/getting_started: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet disable_test: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners examples/wifi/iperf: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet 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 17b7a69168..84bfceb0f9 100644 --- a/examples/zigbee/.build-test-rules.yml +++ b/examples/zigbee/.build-test-rules.yml @@ -2,9 +2,9 @@ examples/zigbee/esp_zigbee_gateway: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet examples/zigbee/esp_zigbee_rcp: enable: diff --git a/pytest.ini b/pytest.ini index 48ffebf9ea..9efcda948b 100644 --- a/pytest.ini +++ b/pytest.ini @@ -24,9 +24,10 @@ markers = esp32s3: support esp32s3 target esp32c3: support esp32c3 target esp32c2: support esp32c2 target + esp32c6: support esp32c6 target esp32h2: support esp32h2 target supported_targets: support all supported targets ('esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2') - preview_targets: support all preview targets ('linux', 'esp32h2') + preview_targets: support all preview targets ('linux', 'esp32h2', 'esp32c6') all_targets: support all targets, including supported ones and preview ones # env markers diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index f75a3e710b..aa1807148e 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -513,7 +513,7 @@ function run_tests() print_status "Test build ESP-IDF as a library to a custom CMake projects for all targets" IDF_AS_LIB=$IDF_PATH/examples/build_system/cmake/idf_as_lib # note: we just need to run cmake - for TARGET in "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp32c2" + for TARGET in "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp32c2" "esp32c6" do echo "Build idf_as_lib for $TARGET target" rm -rf build diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 73e5a262bc..4b2e501033 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -11,6 +11,12 @@ 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" @@ -19,6 +25,12 @@ tools/test_apps/linux_compatible/hello_world_linux_compatible: temporary: true reason: pytest doesn't support linux target yet, hence, it's tested independenly in the host_tests stage +tools/test_apps/peripherals/i2c_wifi: + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet + tools/test_apps/peripherals/usb: enable: - if: IDF_TARGET in ["esp32s2", "esp32s3"] @@ -27,9 +39,9 @@ tools/test_apps/peripherals/usb: tools/test_apps/phy/phy_multi_init_data_test: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet tools/test_apps/protocols/esp_netif/build_config: enable: @@ -79,9 +91,9 @@ tools/test_apps/system/bootloader_sections: tools/test_apps/system/build_test: disable: - - if: IDF_TARGET == "esp32c2" + - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true - reason: target esp32c2 is not supported yet + reason: target(s) not supported yet tools/test_apps/system/cxx_no_except: enable: @@ -116,6 +128,10 @@ tools/test_apps/system/gdb_loadable_elf: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + disable: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet tools/test_apps/system/longjmp_test: enable: @@ -160,3 +176,7 @@ tools/test_apps/system/panic: - if: IDF_TARGET not in ["esp32", "esp32s2"] temporary: true reason: lack of runners + +tools/test_apps/system/startup: + enable: + - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32h2", "esp32c6"] # preview targets diff --git a/tools/test_apps/build_system/embed_test/README.md b/tools/test_apps/build_system/embed_test/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 7364d8cf60..6b2206942e 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | 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/linux_compatible/hello_world_linux_compatible/README.md b/tools/test_apps/linux_compatible/hello_world_linux_compatible/README.md index 2a5c7d4293..379ef646a7 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-S2 | ESP32-S3 | Linux | -| ----------------- | ----- | -------- | -------- | -------- | -------- | ----- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 29d32516b6..2a2585db79 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 471e04adb1..ccd2f8395c 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | 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 afb57b9825..cdb3ea5c87 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | We have no rtc memory on ESP32-C2. diff --git a/tools/test_apps/system/cxx_build_test/README.md b/tools/test_apps/system/cxx_build_test/README.md index 3a725bb03d..9a2e73b51b 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 47db72b2a3..b157110e8a 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-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | ESP32-C2 Not support this test currently, because some of components have not been supported. IDF-4135 diff --git a/tools/test_apps/system/gdb/README.md b/tools/test_apps/system/gdb/README.md index 0b4b22e8c3..cb513db5d7 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # IDF GDB test application diff --git a/tools/test_apps/system/panic/README.md b/tools/test_apps/system/panic/README.md index f7a3616dce..9910b8a090 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-C3 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Building Several configurations are provided as `sdkconfig.ci.XXX` and serve as a template. diff --git a/tools/test_apps/system/startup/README.md b/tools/test_apps/system/startup/README.md index b5be4985c5..a8b7833fa3 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-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/startup/pytest_startup.py b/tools/test_apps/system/startup/pytest_startup.py index 109aa6c8de..95ca66da87 100644 --- a/tools/test_apps/system/startup/pytest_startup.py +++ b/tools/test_apps/system/startup/pytest_startup.py @@ -6,6 +6,7 @@ from pytest_embedded import Dut @pytest.mark.supported_targets +@pytest.mark.preview_targets @pytest.mark.generic @pytest.mark.parametrize('config', [ 'default', 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 6e93687e55..ad5a32aa34 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 @@ -28,7 +28,7 @@ #define CACHE_LINE_SIZE 32 #define CACHE_SIZE (1 << 13) #define TEST_SIZE (CACHE_SIZE) -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 #define CACHE_WAYS 8 #define CACHE_LINE_SIZE 32 #define CACHE_SIZE (1 << 14) 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 6bc2cc9e0b..ca96b377cf 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 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 #define CACHE_WAYS 8 #define CACHE_LINE_SIZE 32 #define CACHE_SIZE (1 << 14) From be0fdfa176e27da06fa560205ea9a01078631ad2 Mon Sep 17 00:00:00 2001 From: Song Ruo Jing Date: Thu, 27 Oct 2022 17:18:17 +0800 Subject: [PATCH 3/3] soc: Add a soc cap, SOC_CLK_RC_FAST_D256_SUPPORTED, for whether the target has the RC_FAST_D256 clock --- .../test_apps/bootloader_support/README.md | 4 +- .../test_apps/rtc_custom_section/README.md | 4 +- .../console/test_apps/console/README.md | 4 +- components/driver/ledc.c | 4 +- components/esp-tls/test_apps/README.md | 4 +- components/esp_app_format/test_apps/README.md | 4 +- .../esp_http_client/test_apps/README.md | 4 +- .../esp_http_server/test_apps/README.md | 4 +- components/esp_hw_support/clk_ctrl_os.c | 6 +- components/esp_hw_support/sleep_modes.c | 4 +- .../esp_hw_support/test_apps/dma/README.md | 4 +- components/esp_rom/test_apps/README.md | 4 +- components/esp_system/.build-test-rules.yml | 4 +- components/espcoredump/test_apps/README.md | 4 +- components/heap/test_apps/README.md | 4 +- components/lwip/test_afl_host/README.md | 4 +- components/mbedtls/test_apps/README.md | 4 +- components/protocomm/test_apps/README.md | 4 +- .../test_apps/pthread_unity_tests/README.md | 4 +- .../soc/esp32/include/soc/Kconfig.soc_caps.in | 56 +++++++++---------- components/soc/esp32/include/soc/soc_caps.h | 21 +++---- .../esp32c2/include/soc/Kconfig.soc_caps.in | 12 ++-- components/soc/esp32c2/include/soc/soc_caps.h | 5 +- .../esp32c3/include/soc/Kconfig.soc_caps.in | 12 ++-- components/soc/esp32c3/include/soc/soc_caps.h | 6 +- .../esp32s2/include/soc/Kconfig.soc_caps.in | 52 +++++++++-------- components/soc/esp32s2/include/soc/soc_caps.h | 20 ++++--- .../esp32s3/include/soc/Kconfig.soc_caps.in | 12 ++-- components/soc/esp32s3/include/soc/soc_caps.h | 5 +- .../cmake/component_manager/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/security/flash_encryption/README.md | 4 +- 38 files changed, 170 insertions(+), 145 deletions(-) diff --git a/components/bootloader_support/test_apps/bootloader_support/README.md b/components/bootloader_support/test_apps/bootloader_support/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 497a93ba72..6f026d8e9e 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/console/test_apps/console/README.md b/components/console/test_apps/console/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/driver/ledc.c b/components/driver/ledc.c index e62250c6e0..88766ed9f4 100644 --- a/components/driver/ledc.c +++ b/components/driver/ledc.c @@ -101,8 +101,8 @@ static bool ledc_slow_clk_calibrate(void) { if (periph_rtc_dig_clk8m_enable()) { s_ledc_slow_clk_8M = periph_rtc_dig_clk8m_get_freq(); -#if CONFIG_IDF_TARGET_ESP32H2 - /* Workaround: Calibration cannot be done for CLK8M on H2, we just use its theoretic frequency */ +#if !SOC_CLK_RC_FAST_D256_SUPPORTED + /* Workaround: CLK8M calibration cannot be performed if there is no d256 div clk, we can only use its theoretic freq */ ESP_LOGD(LEDC_TAG, "Calibration cannot be performed, approximate CLK8M_CLK : %"PRIu32" Hz", s_ledc_slow_clk_8M); #else ESP_LOGD(LEDC_TAG, "Calibrate CLK8M_CLK : %"PRIu32" Hz", s_ledc_slow_clk_8M); diff --git a/components/esp-tls/test_apps/README.md b/components/esp-tls/test_apps/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 27995c13b2..cd9be654c0 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_hw_support/clk_ctrl_os.c b/components/esp_hw_support/clk_ctrl_os.c index 3cf14aebc1..3517d3e546 100644 --- a/components/esp_hw_support/clk_ctrl_os.c +++ b/components/esp_hw_support/clk_ctrl_os.c @@ -26,7 +26,7 @@ bool periph_rtc_dig_clk8m_enable(void) portENTER_CRITICAL(&periph_spinlock); if (s_periph_ref_counts == 0) { rtc_dig_clk8m_enable(); -#if !CONFIG_IDF_TARGET_ESP32H2 +#if SOC_CLK_RC_FAST_D256_SUPPORTED s_rtc_clk_freq = rtc_clk_freq_cal(rtc_clk_cal(RTC_CAL_8MD256, 100)); if (s_rtc_clk_freq == 0) { portEXIT_CRITICAL(&periph_spinlock); @@ -41,8 +41,8 @@ bool periph_rtc_dig_clk8m_enable(void) uint32_t periph_rtc_dig_clk8m_get_freq(void) { -#if CONFIG_IDF_TARGET_ESP32H2 - /* Workaround: H2 doesn't have 8MD256 clk, so calibration cannot be done, we just return its theoretic frequency */ +#if !SOC_CLK_RC_FAST_D256_SUPPORTED + /* Workaround: CLK8M calibration cannot be performed if there is no d256 div clk, we can only return its theoretic value */ return SOC_CLK_RC_FAST_FREQ_APPROX; #else return s_rtc_clk_freq * 256; diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c index 564f0e55c0..4208465cfa 100644 --- a/components/esp_hw_support/sleep_modes.c +++ b/components/esp_hw_support/sleep_modes.c @@ -401,8 +401,8 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) suspend_uarts(); } -#if SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - //Keep the RTC8M_CLK on if RTC clock is 8MD256. +#if SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + //Keep the RTC8M_CLK on if RTC clock is rc_fast_d256. bool rtc_using_8md256 = (rtc_clk_slow_src_get() == SOC_RTC_SLOW_CLK_SRC_RC_FAST_D256); #else bool rtc_using_8md256 = false; diff --git a/components/esp_hw_support/test_apps/dma/README.md b/components/esp_hw_support/test_apps/dma/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_rom/test_apps/README.md b/components/esp_rom/test_apps/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml index e89e6d7681..b4ddfd4dde 100644 --- a/components/esp_system/.build-test-rules.yml +++ b/components/esp_system/.build-test-rules.yml @@ -2,9 +2,7 @@ components/esp_system/test_apps/rtc_8md256: disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet + - if: SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 != 1 components/esp_system/test_apps/rtc_power_modes: enable: - if: IDF_TARGET == "esp32s3" diff --git a/components/espcoredump/test_apps/README.md b/components/espcoredump/test_apps/README.md index f0bf02b571..f5f0074d6c 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # ESP Core Dump Tests diff --git a/components/heap/test_apps/README.md b/components/heap/test_apps/README.md index 284564238d..2beabff547 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 9d7665ee50..3793b98ad0 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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/mbedtls/test_apps/README.md b/components/mbedtls/test_apps/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/protocomm/test_apps/README.md b/components/protocomm/test_apps/README.md index b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b5be4985c5..7e7523ec85 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index 2e3061f0c4..fc032e8445 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -207,10 +207,6 @@ config SOC_ADC_RTC_MAX_BITWIDTH int default 12 -config SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - bool - default y - config SOC_SHARED_IDCACHE_SUPPORTED bool default y @@ -291,26 +287,6 @@ config SOC_I2C_SUPPORT_APB bool default y -config SOC_CLK_APLL_SUPPORTED - bool - default y - -config SOC_APLL_MULTIPLIER_OUT_MIN_HZ - int - default 350000000 - -config SOC_APLL_MULTIPLIER_OUT_MAX_HZ - int - default 500000000 - -config SOC_APLL_MIN_HZ - int - default 5303031 - -config SOC_APLL_MAX_HZ - int - default 125000000 - config SOC_I2S_NUM int default 2 @@ -719,6 +695,34 @@ config SOC_PM_SUPPORT_RTC_SLOW_MEM_PD bool default y +config SOC_CLK_APLL_SUPPORTED + bool + default y + +config SOC_APLL_MULTIPLIER_OUT_MIN_HZ + int + default 350000000 + +config SOC_APLL_MULTIPLIER_OUT_MAX_HZ + int + default 500000000 + +config SOC_APLL_MIN_HZ + int + default 5303031 + +config SOC_APLL_MAX_HZ + int + default 125000000 + +config SOC_CLK_RC_FAST_D256_SUPPORTED + bool + default y + +config SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + bool + default y + config SOC_SDMMC_USE_IOMUX bool default y @@ -727,10 +731,6 @@ config SOC_SDMMC_NUM_SLOTS int default 2 -config SOC_WIFI_HW_TSF - bool - default n - config SOC_WIFI_FTM_SUPPORT bool default n diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index a2e7545c29..cea3f6d1d6 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -125,7 +125,6 @@ /*!< RTC */ #define SOC_ADC_RTC_MIN_BITWIDTH (9) #define SOC_ADC_RTC_MAX_BITWIDTH (12) -#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1) /*-------------------------- BROWNOUT CAPS -----------------------------------*/ #if SOC_CAPS_ECO_VER >= 1 @@ -181,14 +180,6 @@ #define SOC_I2C_SUPPORT_APB (1) -/*-------------------------- APLL CAPS ----------------------------------------*/ -#define SOC_CLK_APLL_SUPPORTED (1) -// apll_multiplier_out = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536) -#define SOC_APLL_MULTIPLIER_OUT_MIN_HZ (350000000) // 350 MHz -#define SOC_APLL_MULTIPLIER_OUT_MAX_HZ (500000000) // 500 MHz -#define SOC_APLL_MIN_HZ (5303031) // 5.303031 MHz, refer to 'periph_rtc_apll_freq_set' for the calculation -#define SOC_APLL_MAX_HZ (125000000) // 125MHz, refer to 'periph_rtc_apll_freq_set' for the calculation - /*-------------------------- I2S CAPS ----------------------------------------*/ // ESP32 has 2 I2S #define SOC_I2S_NUM (2U) @@ -370,6 +361,17 @@ #define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1) +/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ +#define SOC_CLK_APLL_SUPPORTED (1) +// apll_multiplier_out = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536) +#define SOC_APLL_MULTIPLIER_OUT_MIN_HZ (350000000) // 350 MHz +#define SOC_APLL_MULTIPLIER_OUT_MAX_HZ (500000000) // 500 MHz +#define SOC_APLL_MIN_HZ (5303031) // 5.303031 MHz, refer to 'periph_rtc_apll_freq_set' for the calculation +#define SOC_APLL_MAX_HZ (125000000) // 125MHz, refer to 'periph_rtc_apll_freq_set' for the calculation + +#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) +#define SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 (1) + /*-------------------------- SDMMC CAPS -----------------------------------------*/ /* On ESP32, clock/cmd/data pins use IO MUX. @@ -379,7 +381,6 @@ #define SOC_SDMMC_NUM_SLOTS 2 /*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/ -#define SOC_WIFI_HW_TSF (0) /*!< Hardware TSF is not supported */ #define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ #define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */ #define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in index 325794417c..056512fb3d 100644 --- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in @@ -143,10 +143,6 @@ config SOC_ADC_RTC_MAX_BITWIDTH int default 12 -config SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - bool - default y - config SOC_ADC_CALIBRATION_V1_SUPPORTED bool default y @@ -571,6 +567,14 @@ config SOC_PM_SUPPORT_BT_PD bool default n +config SOC_CLK_RC_FAST_D256_SUPPORTED + bool + default y + +config SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + bool + default y + config SOC_WIFI_HW_TSF bool default y diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h index 43c2db37e9..50762e159b 100644 --- a/components/soc/esp32c2/include/soc/soc_caps.h +++ b/components/soc/esp32c2/include/soc/soc_caps.h @@ -71,7 +71,6 @@ /*!< RTC */ #define SOC_ADC_RTC_MIN_BITWIDTH (12) #define SOC_ADC_RTC_MAX_BITWIDTH (12) -#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1) /*!< Calibration */ #define SOC_ADC_CALIBRATION_V1_SUPPORTED (1) /*!< support HW offset calibration version 1*/ @@ -276,6 +275,10 @@ #define SOC_PM_SUPPORT_WIFI_PD (0) #define SOC_PM_SUPPORT_BT_PD (0) +/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ +#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) +#define SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 (1) + /*------------------------------------ WI-FI CAPS ------------------------------------*/ #define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ #define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index 84578d3cc0..6a715917e9 100644 --- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in @@ -495,10 +495,6 @@ config SOC_RTC_CNTL_CPU_PD_REG_FILE_NUM int default 108 -config SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - bool - default y - config SOC_RTCIO_PIN_COUNT int default 0 @@ -803,6 +799,14 @@ config SOC_PM_SUPPORT_BT_PD bool default y +config SOC_CLK_RC_FAST_D256_SUPPORTED + bool + default y + +config SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + bool + default y + config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC bool default y diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index 90dd288885..ba86f24ded 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -227,8 +227,6 @@ #define SOC_RTC_CNTL_CPU_PD_RETENTION_MEM_SIZE (SOC_RTC_CNTL_CPU_PD_REG_FILE_NUM * (SOC_RTC_CNTL_CPU_PD_DMA_BUS_WIDTH >> 3)) -#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1) - /*-------------------------- RTCIO CAPS --------------------------------------*/ /* No dedicated RTCIO subsystem on ESP32-C3. RTC functions are still supported * for hold, wake & 32kHz crystal functions - via rtc_cntl_reg */ @@ -371,6 +369,10 @@ #define SOC_PM_SUPPORT_BT_PD (1) +/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ +#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) +#define SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 (1) + /*-------------------------- Temperature Sensor CAPS -------------------------------------*/ #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC (1) #define SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL (1) diff --git a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in index 958e4ffecc..ad3cb1c70b 100644 --- a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in @@ -231,10 +231,6 @@ config SOC_ADC_RTC_MAX_BITWIDTH int default 13 -config SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - bool - default y - config SOC_ADC_CALIBRATION_V1_SUPPORTED bool default y @@ -351,26 +347,6 @@ config SOC_I2C_SUPPORT_APB bool default y -config SOC_CLK_APLL_SUPPORTED - bool - default y - -config SOC_APLL_MULTIPLIER_OUT_MIN_HZ - int - default 350000000 - -config SOC_APLL_MULTIPLIER_OUT_MAX_HZ - int - default 500000000 - -config SOC_APLL_MIN_HZ - int - default 5303031 - -config SOC_APLL_MAX_HZ - int - default 125000000 - config SOC_I2S_NUM int default 1 @@ -911,6 +887,34 @@ config SOC_PM_SUPPORT_RTC_SLOW_MEM_PD bool default y +config SOC_CLK_APLL_SUPPORTED + bool + default y + +config SOC_APLL_MULTIPLIER_OUT_MIN_HZ + int + default 350000000 + +config SOC_APLL_MULTIPLIER_OUT_MAX_HZ + int + default 500000000 + +config SOC_APLL_MIN_HZ + int + default 5303031 + +config SOC_APLL_MAX_HZ + int + default 125000000 + +config SOC_CLK_RC_FAST_D256_SUPPORTED + bool + default y + +config SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + bool + default y + config SOC_COEX_HW_PTI bool default y diff --git a/components/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h index dc8cf3316f..b90f75b72f 100644 --- a/components/soc/esp32s2/include/soc/soc_caps.h +++ b/components/soc/esp32s2/include/soc/soc_caps.h @@ -107,7 +107,6 @@ /*!< RTC */ #define SOC_ADC_RTC_MIN_BITWIDTH (13) #define SOC_ADC_RTC_MAX_BITWIDTH (13) -#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1) /*!< Calibration */ #define SOC_ADC_CALIBRATION_V1_SUPPORTED (1) /*!< support HW offset calibration version 1*/ @@ -176,14 +175,6 @@ #define SOC_I2C_SUPPORT_REF_TICK (1) #define SOC_I2C_SUPPORT_APB (1) -/*-------------------------- APLL CAPS ----------------------------------------*/ -#define SOC_CLK_APLL_SUPPORTED (1) -// apll_multiplier_out = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536) -#define SOC_APLL_MULTIPLIER_OUT_MIN_HZ (350000000) // 350 MHz -#define SOC_APLL_MULTIPLIER_OUT_MAX_HZ (500000000) // 500 MHz -#define SOC_APLL_MIN_HZ (5303031) // 5.303031 MHz, refer to 'periph_rtc_apll_freq_set' for the calculation -#define SOC_APLL_MAX_HZ (125000000) // 125MHz, refer to 'periph_rtc_apll_freq_set' for the calculation - /*-------------------------- I2S CAPS ----------------------------------------*/ // ESP32-S2 has 1 I2S #define SOC_I2S_NUM (1U) @@ -405,6 +396,17 @@ #define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1) +/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ +#define SOC_CLK_APLL_SUPPORTED (1) +// apll_multiplier_out = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536) +#define SOC_APLL_MULTIPLIER_OUT_MIN_HZ (350000000) // 350 MHz +#define SOC_APLL_MULTIPLIER_OUT_MAX_HZ (500000000) // 500 MHz +#define SOC_APLL_MIN_HZ (5303031) // 5.303031 MHz, refer to 'periph_rtc_apll_freq_set' for the calculation +#define SOC_APLL_MAX_HZ (125000000) // 125MHz, refer to 'periph_rtc_apll_freq_set' for the calculation + +#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) +#define SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 (1) + /*-------------------------- COEXISTENCE HARDWARE PTI CAPS -------------------------------*/ #define SOC_COEX_HW_PTI (1) /* ---------------------------- Compatibility ------------------------------- */ diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index 9aabb07562..c08e1b8271 100644 --- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in @@ -291,10 +291,6 @@ config SOC_ADC_RTC_MAX_BITWIDTH int default 12 -config SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 - bool - default y - config SOC_ADC_CALIBRATION_V1_SUPPORTED bool default y @@ -943,6 +939,14 @@ config SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY bool default y +config SOC_CLK_RC_FAST_D256_SUPPORTED + bool + default y + +config SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 + bool + default y + config SOC_SECURE_BOOT_V2_RSA bool default y diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 8e7997bab9..1ac13266cb 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -100,7 +100,6 @@ /*!< RTC */ #define SOC_ADC_RTC_MIN_BITWIDTH (12) #define SOC_ADC_RTC_MAX_BITWIDTH (12) -#define SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256 (1) /*!< Calibration */ #define SOC_ADC_CALIBRATION_V1_SUPPORTED (1) /*!< support HW offset calibration version 1*/ @@ -399,6 +398,10 @@ #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) +/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ +#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) +#define SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 (1) + /*-------------------------- Secure Boot CAPS----------------------------*/ #define SOC_SECURE_BOOT_V2_RSA 1 #define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 3 diff --git a/examples/build_system/cmake/component_manager/README.md b/examples/build_system/cmake/component_manager/README.md index 028a0e8ffb..68ff76339e 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Using the component manager for downloading dependencies diff --git a/examples/build_system/cmake/import_lib/README.md b/examples/build_system/cmake/import_lib/README.md index 422813c599..18810a4e4d 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 6e6748d2c6..ddf16e7d40 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 01f3e15362..66695a7a44 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 d987b99d27..4eb867d052 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 05d28f1ac9..9d4ffd9845 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 06f8dc72b3..6292d5299d 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 b9fb736ccd..cf32eb86f7 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-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Bootloader override diff --git a/examples/security/flash_encryption/README.md b/examples/security/flash_encryption/README.md index 7c1182cfae..6714008b82 100644 --- a/examples/security/flash_encryption/README.md +++ b/examples/security/flash_encryption/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | # Flash Encryption