From 85d5630f2aee4c09292f6a75392c9eab2709ad0c Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Thu, 20 Nov 2025 17:51:31 +0800 Subject: [PATCH] refactor(ci): manually list the g0 components used by g1 components --- .../system/g1_components/CMakeLists.txt | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/tools/test_apps/system/g1_components/CMakeLists.txt b/tools/test_apps/system/g1_components/CMakeLists.txt index 60d07f9d0e..3aec4b7cb1 100644 --- a/tools/test_apps/system/g1_components/CMakeLists.txt +++ b/tools/test_apps/system/g1_components/CMakeLists.txt @@ -6,7 +6,27 @@ cmake_minimum_required(VERSION 3.22) set(g0_components soc hal esp_common esp_rom) # also , i.e. xtensa or riscv, will be added below set(g1_components spi_flash freertos log heap esp_libc esp_system esp_hw_support esp_mm esp_stdio) -set(COMPONENTS ${g0_components} ${g1_components} main) +# The HAL components that required by G1 components +# Most of these HAL components are required by `clk.c` in `esp_system` for peripherals clock initialization. +set(esp_hal_components + esp_hal_ana_conv + esp_hal_cam + esp_hal_dma + esp_hal_gpio + esp_hal_i2c + esp_hal_i2s + esp_hal_lcd + esp_hal_mcpwm + esp_hal_mspi + esp_hal_parlio + esp_hal_pcnt + esp_hal_timg + esp_hal_touch_sens + esp_hal_twai + esp_hal_usb + esp_hal_wdt +) +set(COMPONENTS ${g0_components} ${g1_components} ${esp_hal_components} main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) @@ -18,20 +38,6 @@ set(extra_allowed_components ${CONFIG_IDF_TARGET_ARCH} ) -# Since esp_hal_* components are split from original hal component, so we can allow they are g1 components. -# But in the future, esp_hal_* components should be removed from common build. IDF-13980 -file(GLOB esp_hal_component_dirs "${idf_path}/components/esp_hal_*") -set(esp_hal_components "") -foreach(hal_dir ${esp_hal_component_dirs}) - if(IS_DIRECTORY ${hal_dir} AND EXISTS "${hal_dir}/CMakeLists.txt") - get_filename_component(hal_name ${hal_dir} NAME) - list(APPEND esp_hal_components ${hal_name}) - endif() -endforeach() - -# Remove the esp_hal_xxx that not compiled in G1 -list(REMOVE_ITEM esp_hal_components "esp_hal_ana_cmpr") - # These components are currently included into "G1" build, but shouldn't. # After removing the extra dependencies, remove the components from this list as well. set(extra_components_which_shouldnt_be_included @@ -121,7 +127,6 @@ set(expected_components ${COMPONENTS} ${extra_allowed_components} ${extra_components_which_shouldnt_be_included} - ${esp_hal_components} ) list(SORT expected_components)