From 1f84f6c6ed08292c73785e7c96b7606f060863e0 Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Mon, 17 Apr 2023 18:49:51 +0800 Subject: [PATCH] esp32h4: remove esp32h4 target from ci --- .gitlab/ci/build.yml | 23 ----- .gitlab/ci/dependencies/dependencies.yml | 1 - .gitlab/ci/host-test.yml | 5 -- .gitlab/ci/rules.yml | 89 ------------------- conftest.py | 5 +- docs/doxygen/Doxyfile_esp32h4 | 1 - .../en/api-reference/peripherals/clk_tree.rst | 2 +- .../release-5.x/5.0/removed-components.rst | 2 +- .../release-5.x/5.0/removed-components.rst | 2 +- .../cmake/idf_as_lib/CMakeLists.txt | 2 +- .../build_system/cmake/idf_as_lib/README.md | 4 +- .../cmake/idf_as_lib/build-esp32h4.sh | 1 - .../cmake/idf_as_lib/run-esp32h4.sh | 1 - examples/get-started/.build-test-rules.yml | 2 +- examples/get-started/hello_world/README.md | 4 +- .../peripherals/gpio/generic_gpio/README.md | 2 +- .../generic_gpio/main/gpio_example_main.c | 4 +- .../components/cmd_system/cmd_system_common.c | 4 +- tools/ci/build_template_app.sh | 4 +- tools/ci/check_build_test_rules.py | 6 +- tools/ci/executable-list.txt | 2 - tools/ci/test_build_system_cmake.sh | 2 +- tools/test_apps/.build-test-rules.yml | 10 +-- tools/test_apps/system/eh_frame/README.md | 4 +- .../test_apps/system/g0_components/README.md | 4 +- tools/test_apps/system/panic/README.md | 4 +- tools/test_apps/system/startup/README.md | 4 +- tools/test_build_system/test_cmake.py | 2 +- tools/tools.json | 5 +- 29 files changed, 36 insertions(+), 165 deletions(-) delete mode 100644 docs/doxygen/Doxyfile_esp32h4 delete mode 120000 examples/build_system/cmake/idf_as_lib/build-esp32h4.sh delete mode 120000 examples/build_system/cmake/idf_as_lib/run-esp32h4.sh diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index ccade92788..b3883ede7e 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -215,14 +215,6 @@ build_pytest_examples_esp32c2: IDF_TARGET: esp32c2 TEST_DIR: examples -build_pytest_examples_esp32h4: - extends: - - .build_pytest_no_jtag_template - - .rules:build:example_test-esp32h4 - variables: - IDF_TARGET: esp32h4 - TEST_DIR: examples - build_pytest_examples_jtag: # for all targets extends: - .build_pytest_jtag_template @@ -649,14 +641,6 @@ build_examples_cmake_esp32c3: IDF_TARGET: esp32c3 TEST_DIR: examples -build_examples_cmake_esp32h4: - extends: - - .build_cmake_template - - .rules:build:example_test-esp32h4 - variables: - IDF_TARGET: esp32h4 - TEST_DIR: examples - build_examples_cmake_esp32c6: extends: - .build_cmake_template @@ -729,13 +713,6 @@ build_clang_test_apps_esp32c6: variables: IDF_TARGET: esp32c6 -build_clang_test_apps_esp32h4: - extends: - - .build_clang_test_apps_riscv - - .rules:build:custom_test-esp32h4 - variables: - IDF_TARGET: esp32h4 - .test_build_system_template: stage: host_test extends: diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index d0f4c71afc..8220351063 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -3,7 +3,6 @@ - esp32s2 - esp32s3 - esp32c3 - - esp32h4 - esp32c2 - esp32c6 - esp32h2 diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index ee451e2f57..157e2c68d5 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -175,11 +175,6 @@ test_efuse_table_on_host_esp32c6: variables: IDF_TARGET: esp32c6 -test_efuse_table_on_host_esp32h4: - extends: .test_efuse_table_on_host_template - variables: - IDF_TARGET: esp32h4 - test_espcoredump: extends: .host_test_template artifacts: diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index eeca549489..8fcabe1f9c 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -470,9 +470,6 @@ .if-label-component_ut_esp32h2: &if-label-component_ut_esp32h2 if: '$BOT_LABEL_COMPONENT_UT_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32h2(?:,[^,\n\r]+)*$/i' -.if-label-component_ut_esp32h4: &if-label-component_ut_esp32h4 - if: '$BOT_LABEL_COMPONENT_UT_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32h4(?:,[^,\n\r]+)*$/i' - .if-label-component_ut_esp32s2: &if-label-component_ut_esp32s2 if: '$BOT_LABEL_COMPONENT_UT_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32s2(?:,[^,\n\r]+)*$/i' @@ -497,9 +494,6 @@ .if-label-custom_test_esp32h2: &if-label-custom_test_esp32h2 if: '$BOT_LABEL_CUSTOM_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32h2(?:,[^,\n\r]+)*$/i' -.if-label-custom_test_esp32h4: &if-label-custom_test_esp32h4 - if: '$BOT_LABEL_CUSTOM_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32h4(?:,[^,\n\r]+)*$/i' - .if-label-custom_test_esp32s2: &if-label-custom_test_esp32s2 if: '$BOT_LABEL_CUSTOM_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32s2(?:,[^,\n\r]+)*$/i' @@ -527,9 +521,6 @@ .if-label-example_test_esp32h2: &if-label-example_test_esp32h2 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32h2(?:,[^,\n\r]+)*$/i' -.if-label-example_test_esp32h4: &if-label-example_test_esp32h4 - if: '$BOT_LABEL_EXAMPLE_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32h4(?:,[^,\n\r]+)*$/i' - .if-label-example_test_esp32s2: &if-label-example_test_esp32s2 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32s2(?:,[^,\n\r]+)*$/i' @@ -584,9 +575,6 @@ .if-label-unit_test_esp32h2: &if-label-unit_test_esp32h2 if: '$BOT_LABEL_UNIT_TEST_ESP32H2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32h2(?:,[^,\n\r]+)*$/i' -.if-label-unit_test_esp32h4: &if-label-unit_test_esp32h4 - if: '$BOT_LABEL_UNIT_TEST_ESP32H4 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32h4(?:,[^,\n\r]+)*$/i' - .if-label-unit_test_esp32s2: &if-label-unit_test_esp32s2 if: '$BOT_LABEL_UNIT_TEST_ESP32S2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32s2(?:,[^,\n\r]+)*$/i' @@ -621,7 +609,6 @@ - <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32c6 - <<: *if-label-component_ut_esp32h2 - - <<: *if-label-component_ut_esp32h4 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 - <<: *if-label-lan8720 @@ -632,7 +619,6 @@ - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - - <<: *if-label-unit_test_esp32h4 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push @@ -909,7 +895,6 @@ - <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32c6 - <<: *if-label-custom_test_esp32h2 - - <<: *if-label-custom_test_esp32h4 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - <<: *if-label-target_test @@ -1060,32 +1045,6 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi -.rules:build:custom_test-esp32h4: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-custom_test - - <<: *if-label-custom_test_esp32h4 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-custom_test - - <<: *if-dev-push - changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - - <<: *if-dev-push - changes: *patterns-target_test-i154 - - <<: *if-dev-push - changes: *patterns-target_test-wifi - .rules:build:custom_test-esp32s2: rules: - <<: *if-revert-branch @@ -1167,7 +1126,6 @@ - <<: *if-label-example_test_esp32c3 - <<: *if-label-example_test_esp32c6 - <<: *if-label-example_test_esp32h2 - - <<: *if-label-example_test_esp32h4 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - <<: *if-label-target_test @@ -1416,48 +1374,6 @@ - <<: *if-dev-push changes: *patterns-target_test-wifi -.rules:build:example_test-esp32h4: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32h4 - - <<: *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-ccs811 - - <<: *if-dev-push - changes: *patterns-example_test-ethernet - - <<: *if-dev-push - changes: *patterns-example_test-i154 - - <<: *if-dev-push - changes: *patterns-example_test-sdio - - <<: *if-dev-push - changes: *patterns-example_test-usb - - <<: *if-dev-push - changes: *patterns-example_test-wifi - - <<: *if-dev-push - changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - - <<: *if-dev-push - changes: *patterns-target_test-i154 - - <<: *if-dev-push - changes: *patterns-target_test-wifi - .rules:build:example_test-esp32s2: rules: - <<: *if-revert-branch @@ -1589,7 +1505,6 @@ - <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32c6 - <<: *if-label-component_ut_esp32h2 - - <<: *if-label-component_ut_esp32h4 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 - <<: *if-label-custom_test @@ -1598,7 +1513,6 @@ - <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32c6 - <<: *if-label-custom_test_esp32h2 - - <<: *if-label-custom_test_esp32h4 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - <<: *if-label-example_test @@ -1607,7 +1521,6 @@ - <<: *if-label-example_test_esp32c3 - <<: *if-label-example_test_esp32c6 - <<: *if-label-example_test_esp32h2 - - <<: *if-label-example_test_esp32h4 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - <<: *if-label-integration_test @@ -1621,7 +1534,6 @@ - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - - <<: *if-label-unit_test_esp32h4 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push @@ -1691,7 +1603,6 @@ - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32c6 - <<: *if-label-unit_test_esp32h2 - - <<: *if-label-unit_test_esp32h4 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push diff --git a/conftest.py b/conftest.py index e976c52fea..da6f07ba46 100644 --- a/conftest.py +++ b/conftest.py @@ -50,7 +50,7 @@ except ImportError: import common_test_methods # noqa: F401 SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6', 'esp32h2'] -PREVIEW_TARGETS = ['esp32h4'] # this PREVIEW_TARGETS excludes 'linux' target +PREVIEW_TARGETS: List[str] = [] # this PREVIEW_TARGETS excludes 'linux' target DEFAULT_SDKCONFIG = 'default' TARGET_MARKERS = { @@ -60,14 +60,13 @@ TARGET_MARKERS = { 'esp32c3': 'support esp32c3 target', 'esp32c2': 'support esp32c2 target', 'esp32c6': 'support esp32c6 target', - 'esp32h4': 'support esp32h4 target', 'esp32h2': 'support esp32h2 target', 'linux': 'support linux target', } SPECIAL_MARKERS = { 'supported_targets': "support all officially announced supported targets ('esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6')", - 'preview_targets': "support all preview targets ('esp32h4')", + 'preview_targets': "support all preview targets ('none')", 'all_targets': 'support all targets, including supported ones and preview ones', 'temp_skip_ci': 'temp skip tests for specified targets only in ci', 'temp_skip': 'temp skip tests for specified targets both in ci and locally', diff --git a/docs/doxygen/Doxyfile_esp32h4 b/docs/doxygen/Doxyfile_esp32h4 deleted file mode 100644 index 910f295a01..0000000000 --- a/docs/doxygen/Doxyfile_esp32h4 +++ /dev/null @@ -1 +0,0 @@ -INPUT += \ diff --git a/docs/en/api-reference/peripherals/clk_tree.rst b/docs/en/api-reference/peripherals/clk_tree.rst index 8eb4e4ef82..30284152fa 100644 --- a/docs/en/api-reference/peripherals/clk_tree.rst +++ b/docs/en/api-reference/peripherals/clk_tree.rst @@ -5,7 +5,7 @@ Clock Tree {IDF_TARGET_RC_FAST_ADJUSTED_FREQ: default="8.5", esp32c3="17.5", esp32s3="17.5", esp32c2="17.5", esp32c6="17.5"} -{IDF_TARGET_XTAL_FREQ: default="40", esp32="2~40", esp32c2="40/26", esp32h2="32", esp32h2="32"} +{IDF_TARGET_XTAL_FREQ: default="40", esp32="2~40", esp32c2="40/26", esp32h2="32"} {IDF_TARGET_RC_SLOW_VAGUE_FREQ: default="136", esp32="150", esp32s2="90"} diff --git a/docs/en/migration-guides/release-5.x/5.0/removed-components.rst b/docs/en/migration-guides/release-5.x/5.0/removed-components.rst index 5b587a4c00..7ba898ab4b 100644 --- a/docs/en/migration-guides/release-5.x/5.0/removed-components.rst +++ b/docs/en/migration-guides/release-5.x/5.0/removed-components.rst @@ -57,4 +57,4 @@ The targets components are no longer necessary after refactoring and have been r * ``esp32s3`` * ``esp32c2`` * ``esp32c3`` - * ``esp32h4`` + * ``esp32h2`` diff --git a/docs/zh_CN/migration-guides/release-5.x/5.0/removed-components.rst b/docs/zh_CN/migration-guides/release-5.x/5.0/removed-components.rst index 9e3d103e8c..12c4370fa2 100644 --- a/docs/zh_CN/migration-guides/release-5.x/5.0/removed-components.rst +++ b/docs/zh_CN/migration-guides/release-5.x/5.0/removed-components.rst @@ -57,4 +57,4 @@ IDF v4.x 版本中已不再使用以下组件，这些组件已弃用： * ``esp32s3`` * ``esp32c2`` * ``esp32c3`` - * ``esp32h4`` + * ``esp32h2`` diff --git a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt index 6409d4a6bc..353c6cfb59 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" "esp32h4" "esp32c2" "esp32c6" "esp32h2") +set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32c2" "esp32c6" "esp32h2") 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 bd291059bb..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 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| 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-esp32h4.sh b/examples/build_system/cmake/idf_as_lib/build-esp32h4.sh deleted file mode 120000 index c07a74de4f..0000000000 --- a/examples/build_system/cmake/idf_as_lib/build-esp32h4.sh +++ /dev/null @@ -1 +0,0 @@ -build.sh \ No newline at end of file diff --git a/examples/build_system/cmake/idf_as_lib/run-esp32h4.sh b/examples/build_system/cmake/idf_as_lib/run-esp32h4.sh deleted file mode 120000 index cde8585ed4..0000000000 --- a/examples/build_system/cmake/idf_as_lib/run-esp32h4.sh +++ /dev/null @@ -1 +0,0 @@ -run-esp32.sh \ No newline at end of file diff --git a/examples/get-started/.build-test-rules.yml b/examples/get-started/.build-test-rules.yml index ec68aa7b20..0972e4ceca 100644 --- a/examples/get-started/.build-test-rules.yml +++ b/examples/get-started/.build-test-rules.yml @@ -2,4 +2,4 @@ examples/get-started/hello_world: enable: - - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32h4"] # preview targets + - if: INCLUDE_DEFAULT == 1 diff --git a/examples/get-started/hello_world/README.md b/examples/get-started/hello_world/README.md index e7b9054386..f400cbda43 100644 --- a/examples/get-started/hello_world/README.md +++ b/examples/get-started/hello_world/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Hello World Example diff --git a/examples/peripherals/gpio/generic_gpio/README.md b/examples/peripherals/gpio/generic_gpio/README.md index bd0d1563ac..2070fd10ac 100644 --- a/examples/peripherals/gpio/generic_gpio/README.md +++ b/examples/peripherals/gpio/generic_gpio/README.md @@ -25,7 +25,7 @@ This test code shows how to configure GPIO and how to use it with interruption. | | CONFIG_GPIO_OUTPUT_0 | CONFIG_GPIO_OUTPUT_1 | CONFIG_GPIO_INPUT_0 | CONFIG_GPIO_INPUT_1 | | ---------------------- | -------------------- | -------------------- | ------------------- | ------------------- | -| ESP32C2/ESP32H2/ESP32H2| 8 | 9 | 4 | 5 | +| ESP32C2/ESP32H2 | 8 | 9 | 4 | 5 | | All other chips | 18 | 19 | 4 | 5 | ## How to use example diff --git a/examples/peripherals/gpio/generic_gpio/main/gpio_example_main.c b/examples/peripherals/gpio/generic_gpio/main/gpio_example_main.c index 794fb0bf26..1ef2491e6e 100644 --- a/examples/peripherals/gpio/generic_gpio/main/gpio_example_main.c +++ b/examples/peripherals/gpio/generic_gpio/main/gpio_example_main.c @@ -20,8 +20,8 @@ * This test code shows how to configure gpio and how to use gpio interrupt. * * GPIO status: - * GPIO18: output (ESP32C2/ESP32H2/ESP32H2 uses GPIO8 as the second output pin) - * GPIO19: output (ESP32C2/ESP32H2/ESP32H2 uses GPIO9 as the second output pin) + * GPIO18: output (ESP32C2/ESP32H2 uses GPIO8 as the second output pin) + * GPIO19: output (ESP32C2/ESP32H2 uses GPIO9 as the second output pin) * GPIO4: input, pulled up, interrupt from rising edge and falling edge * GPIO5: input, pulled up, interrupt from rising edge. * diff --git a/examples/system/console/advanced/components/cmd_system/cmd_system_common.c b/examples/system/console/advanced/components/cmd_system/cmd_system_common.c index bb408a946e..d027ecc405 100644 --- a/examples/system/console/advanced/components/cmd_system/cmd_system_common.c +++ b/examples/system/console/advanced/components/cmd_system/cmd_system_common.c @@ -75,8 +75,8 @@ static int get_version(int argc, char **argv) case CHIP_ESP32C3: model = "ESP32-C3"; break; - case CHIP_ESP32H4: - model = "ESP32-H4"; + case CHIP_ESP32H2: + model = "ESP32-H2"; break; case CHIP_ESP32C2: model = "ESP32-C2"; diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh index 4e9cb82e12..8f268f5530 100755 --- a/tools/ci/build_template_app.sh +++ b/tools/ci/build_template_app.sh @@ -64,7 +64,7 @@ build_stage2() { --build-log ${BUILD_LOG_CMAKE} \ --size-file size.json \ --collect-size-info size_info.txt \ - --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,esp32h2 # add esp32h4 back after IDF-5541 + --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,esp32h2 } build_stage1() { @@ -78,7 +78,7 @@ build_stage1() { --build-log ${BUILD_LOG_CMAKE} \ --size-file size.json \ --collect-size-info size_info.txt \ - --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32h4,esp32c6,esp32h2 + --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,esp32h2 } # Default arguments diff --git a/tools/ci/check_build_test_rules.py b/tools/ci/check_build_test_rules.py index 940c7f31a5..b25d30c7c5 100755 --- a/tools/ci/check_build_test_rules.py +++ b/tools/ci/check_build_test_rules.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 import argparse @@ -29,7 +29,6 @@ USUAL_TO_FORMAL = { 'esp32s2': 'ESP32-S2', 'esp32s3': 'ESP32-S3', 'esp32c3': 'ESP32-C3', - 'esp32h4': 'ESP32-H4', 'esp32c2': 'ESP32-C2', 'esp32c6': 'ESP32-C6', 'esp32h2': 'ESP32-H2', @@ -41,7 +40,6 @@ FORMAL_TO_USUAL = { 'ESP32-S2': 'esp32s2', 'ESP32-S3': 'esp32s3', 'ESP32-C3': 'esp32c3', - 'ESP32-H4': 'esp32h4', 'ESP32-C2': 'esp32c2', 'ESP32-C6': 'esp32c6', 'ESP32-H2': 'esp32h2', @@ -221,7 +219,7 @@ def check_test_scripts( # { # app_dir: { # 'script_path': 'path/to/script', - # 'targets': ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32h4', 'esp32c2', 'linux'], + # 'targets': ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c2', 'linux'], # } # } def check_enable_test( diff --git a/tools/ci/executable-list.txt b/tools/ci/executable-list.txt index 2b4086931c..fe2756c72a 100644 --- a/tools/ci/executable-list.txt +++ b/tools/ci/executable-list.txt @@ -31,14 +31,12 @@ docs/check_lang_folder_sync.sh examples/build_system/cmake/idf_as_lib/build-esp32.sh examples/build_system/cmake/idf_as_lib/build-esp32c2.sh examples/build_system/cmake/idf_as_lib/build-esp32c3.sh -examples/build_system/cmake/idf_as_lib/build-esp32h4.sh examples/build_system/cmake/idf_as_lib/build-esp32s2.sh examples/build_system/cmake/idf_as_lib/build-esp32s3.sh examples/build_system/cmake/idf_as_lib/build.sh examples/build_system/cmake/idf_as_lib/run-esp32.sh examples/build_system/cmake/idf_as_lib/run-esp32c2.sh examples/build_system/cmake/idf_as_lib/run-esp32c3.sh -examples/build_system/cmake/idf_as_lib/run-esp32h4.sh examples/build_system/cmake/idf_as_lib/run-esp32s2.sh examples/build_system/cmake/idf_as_lib/run-esp32s3.sh examples/build_system/cmake/idf_as_lib/run.sh diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 4b8701f60c..a29a696f20 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" "esp32h4" "esp32c2" "esp32c6" "esp32h2" + for TARGET in "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32c2" "esp32c6" "esp32h2" 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 8c072cb103..449a56ce60 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -100,7 +100,7 @@ tools/test_apps/system/cxx_pthread_bluetooth: tools/test_apps/system/eh_frame: enable: - - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32h4"] + - if: IDF_TARGET in ["esp32c2", "esp32c3"] temporary: true reason: the other targets are not tested yet @@ -112,7 +112,7 @@ tools/test_apps/system/flash_psram: tools/test_apps/system/g0_components: enable: - - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32h4", "esp32c6", "esp32h2"] # preview targets + - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32c6", "esp32h2"] # preview targets tools/test_apps/system/g1_components: @@ -160,7 +160,7 @@ tools/test_apps/system/no_embedded_paths: tools/test_apps/system/panic: enable: - - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "esp32h4" + - if: INCLUDE_DEFAULT == 1 disable_test: - if: IDF_TARGET not in ["esp32", "esp32s2", "esp32c3", "esp32s3", "esp32c2", "esp32c6", "esp32h2"] temporary: true @@ -168,13 +168,13 @@ tools/test_apps/system/panic: tools/test_apps/system/ram_loadable_app: disable: - - if: IDF_TARGET == "esp32h2" or IDF_TARGET == "esp32h4" + - if: IDF_TARGET == "esp32h2" temporary: true reason: lack of runners tools/test_apps/system/startup: enable: - - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32h4", "esp32c6"] # preview targets + - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32c6"] # preview targets tools/test_apps/system/test_watchpoint: enable: diff --git a/tools/test_apps/system/eh_frame/README.md b/tools/test_apps/system/eh_frame/README.md index 95fbea0c46..ac429be8bd 100644 --- a/tools/test_apps/system/eh_frame/README.md +++ b/tools/test_apps/system/eh_frame/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-H4 | -| ----------------- | -------- | -------- | -------- | +| Supported Targets | ESP32-C2 | ESP32-C3 | +| ----------------- | -------- | -------- | # Building and running diff --git a/tools/test_apps/system/g0_components/README.md b/tools/test_apps/system/g0_components/README.md index 52129284e5..4ebccd4e3d 100644 --- a/tools/test_apps/system/g0_components/README.md +++ b/tools/test_apps/system/g0_components/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # "G0"-components-only app diff --git a/tools/test_apps/system/panic/README.md b/tools/test_apps/system/panic/README.md index 9720983ce6..693fbda6da 100644 --- a/tools/test_apps/system/panic/README.md +++ b/tools/test_apps/system/panic/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Introduction diff --git a/tools/test_apps/system/startup/README.md b/tools/test_apps/system/startup/README.md index 30cd8e3cef..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-C6 | ESP32-H2 | ESP32-H4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/tools/test_build_system/test_cmake.py b/tools/test_build_system/test_cmake.py index d7af9500c1..c3d965d6f9 100644 --- a/tools/test_build_system/test_cmake.py +++ b/tools/test_build_system/test_cmake.py @@ -10,7 +10,7 @@ from test_build_system_helpers import IdfPyFunc, file_contains, run_cmake, run_c def test_build_custom_cmake_project(test_app_copy: Path) -> None: - for target in ['esp32', 'esp32s3', 'esp32c6', 'esp32h4']: + for target in ['esp32', 'esp32s3', 'esp32c6', 'esp32h2']: logging.info(f'Test build ESP-IDF as a library to a custom CMake projects for {target}') idf_path = Path(os.environ['IDF_PATH']) run_cmake_and_build(str(idf_path / 'examples' / 'build_system' / 'cmake' / 'idf_as_lib'), diff --git a/tools/tools.json b/tools/tools.json index 5a52e4492f..9623dc872d 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -92,8 +92,7 @@ "esp32c3", "esp32c2", "esp32c6", - "esp32h2", - "esp32h4" + "esp32h2" ], "version_cmd": [ "riscv32-esp-elf-gdb-no-python", @@ -389,7 +388,6 @@ "esp32s2", "esp32s3", "esp32c3", - "esp32h4", "esp32c2", "esp32c6", "esp32h2" @@ -454,7 +452,6 @@ "esp32s2", "esp32s3", "esp32c3", - "esp32h4", "esp32c2", "esp32c6", "esp32h2"