From fca7d70e0550fc78d16eb9b69e72a403c771635e Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Fri, 8 Jul 2022 16:15:49 +0800 Subject: [PATCH] esp32c6: add minimal ci support - enable build_template_app - enable check public headers - enable g0 components dependency check --- .gitlab/ci/pre_check.yml | 1 + components/esp_adc/esp32c6/include/.gitkeep | 0 .../esp_hw_support/include/soc/esp32c6/.gitkeep | 0 components/esp_rom/esp32c6/.gitkeep | 0 components/esp_rom/include/esp32c6/.gitkeep | 0 components/hal/esp32c6/include/.gitkeep | 0 .../env_caps/esp32c6/Kconfig.env_caps | 16 ++++++++++++++++ tools/ci/build_template_app.sh | 4 ++-- tools/test_apps/.build-test-rules.yml | 2 +- ...plib => sdkconfig.ci.esp32c2_without_rvfplib} | 0 ...sdkconfig.ci.esp32c6_with_rom_impl_components | 5 +++++ ...config.ci.esp32c6_without_rom_impl_components | 5 +++++ .../sdkconfig.ci.esp32c6_without_rvfplib | 2 ++ .../system/g0_components/CMakeLists.txt | 2 +- tools/test_apps/system/g0_components/README.md | 4 ++-- 15 files changed, 35 insertions(+), 6 deletions(-) delete mode 100644 components/esp_adc/esp32c6/include/.gitkeep delete mode 100644 components/esp_hw_support/include/soc/esp32c6/.gitkeep delete mode 100644 components/esp_rom/esp32c6/.gitkeep delete mode 100644 components/esp_rom/include/esp32c6/.gitkeep delete mode 100644 components/hal/esp32c6/include/.gitkeep create mode 100644 examples/common_components/env_caps/esp32c6/Kconfig.env_caps rename tools/test_apps/system/build_test/{sdkconfig.ci.rvfplib => sdkconfig.ci.esp32c2_without_rvfplib} (100%) create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index 1c0cfa1c1d..cb811ea57a 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -92,6 +92,7 @@ check_public_headers: - IDF_TARGET=esp32s3 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s3-elf- - IDF_TARGET=esp32c3 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf- - IDF_TARGET=esp32c2 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf- + - IDF_TARGET=esp32c6 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf- check_chip_support_components: extends: diff --git a/components/esp_adc/esp32c6/include/.gitkeep b/components/esp_adc/esp32c6/include/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/esp_hw_support/include/soc/esp32c6/.gitkeep b/components/esp_hw_support/include/soc/esp32c6/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/esp_rom/esp32c6/.gitkeep b/components/esp_rom/esp32c6/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/esp_rom/include/esp32c6/.gitkeep b/components/esp_rom/include/esp32c6/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/hal/esp32c6/include/.gitkeep b/components/hal/esp32c6/include/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/examples/common_components/env_caps/esp32c6/Kconfig.env_caps b/examples/common_components/env_caps/esp32c6/Kconfig.env_caps new file mode 100644 index 0000000000..39167df4f9 --- /dev/null +++ b/examples/common_components/env_caps/esp32c6/Kconfig.env_caps @@ -0,0 +1,16 @@ +config ENV_GPIO_RANGE_MIN + int + default 0 + +config ENV_GPIO_RANGE_MAX + int + default 30 + # GPIOs 16/17 are always used by UART in examples + +config ENV_GPIO_IN_RANGE_MAX + int + default ENV_GPIO_RANGE_MAX + +config ENV_GPIO_OUT_RANGE_MAX + int + default ENV_GPIO_RANGE_MAX diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh index b79d94fa28..274c87675e 100755 --- a/tools/ci/build_template_app.sh +++ b/tools/ci/build_template_app.sh @@ -62,7 +62,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 # add esp32h2 back after IDF-5541 + --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6 # add esp32h2 back after IDF-5541 } build_stage1() { @@ -76,7 +76,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,esp32h2 + --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32h2,esp32c6 } # Default arguments diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 8bc316fe55..b2c2adbf98 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -95,7 +95,7 @@ tools/test_apps/system/flash_psram: tools/test_apps/system/g0_components: enable: - - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "esp32h2" + - if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["esp32h2", "esp32c6"] # preview targets tools/test_apps/system/g1_components: disable: diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.rvfplib b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rvfplib similarity index 100% rename from tools/test_apps/system/build_test/sdkconfig.ci.rvfplib rename to tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rvfplib diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components new file mode 100644 index 0000000000..cb561f4977 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components @@ -0,0 +1,5 @@ +CONFIG_IDF_TARGET="esp32c6" +CONFIG_HAL_WDT_USE_ROM_IMPL=y +CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=y +CONFIG_HEAP_TLSF_USE_ROM_IMPL=y +CONFIG_SPI_FLASH_ROM_IMPL=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components new file mode 100644 index 0000000000..ee55ffa744 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components @@ -0,0 +1,5 @@ +CONFIG_IDF_TARGET="esp32c6" +CONFIG_HAL_WDT_USE_ROM_IMPL=n +CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=n +CONFIG_HEAP_TLSF_USE_ROM_IMPL=n +CONFIG_SPI_FLASH_ROM_IMPL=n diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib new file mode 100644 index 0000000000..e82ca0e1f0 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32c6" +CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y diff --git a/tools/test_apps/system/g0_components/CMakeLists.txt b/tools/test_apps/system/g0_components/CMakeLists.txt index f5fd24076a..d6433b7fce 100644 --- a/tools/test_apps/system/g0_components/CMakeLists.txt +++ b/tools/test_apps/system/g0_components/CMakeLists.txt @@ -28,7 +28,7 @@ project(g0_components) # As a workaround for ESP32-C2, we need to define the MMU page size here, until MMU hal-driver # is refactored -if(CONFIG_IDF_TARGET_ESP32C2) +if(CONFIG_IDF_TARGET_ESP32C2 OR CONFIG_IDF_TARGET_ESP32C6) idf_build_set_property(C_COMPILE_OPTIONS "-DCONFIG_MMU_PAGE_SIZE=64" APPEND) endif() diff --git a/tools/test_apps/system/g0_components/README.md b/tools/test_apps/system/g0_components/README.md index 420e59a67a..bea7ca0e46 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-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # "G0"-components-only app