mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 03:00:34 +03:00
refactor(ulp): make the ULP subproject directory explicit
components/ulp/cmake holds the project that builds a ULP program. Name it subproject, as the bootloader does.
This commit is contained in:
@@ -25,7 +25,7 @@ components/partition_table/test_gen_esp32part_host/check_sizes_test.py
|
||||
components/partition_table/test_gen_esp32part_host/gen_esp32part_tests.py
|
||||
components/spiffs/spiffsgen.py
|
||||
components/spiffs/test_spiffsgen/test_spiffsgen.py
|
||||
components/ulp/esp32ulp_mapgen.py
|
||||
components/ulp/subproject/esp32ulp_mapgen.py
|
||||
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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} ASM)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} C CXX ASM)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} ASM)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} C CXX ASM)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} C CXX ASM)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
|
||||
include(${IDF_PATH}/components/ulp/cmake/ulp_project.cmake)
|
||||
include(${IDF_PATH}/components/ulp/subproject/ulp_project.cmake)
|
||||
|
||||
project(${IDF_DEFAULT_PROJECT_NAME} C CXX ASM)
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ def _sha256(path: Path) -> str:
|
||||
'entry_point,add_native_executable,expected_available,expected_unavailable',
|
||||
(
|
||||
(
|
||||
'${IDF_PATH}/components/ulp/cmake/ulp_project.cmake',
|
||||
'${IDF_PATH}/components/ulp/subproject/ulp_project.cmake',
|
||||
False,
|
||||
FULL_PROJECT_APIS,
|
||||
LEGACY_PROJECT_APIS,
|
||||
@@ -116,7 +116,7 @@ def test_ulp_cmake_api_availability(
|
||||
build_dir = tmp_path / 'build'
|
||||
project_dir.mkdir()
|
||||
_write_api_probe_project(project_dir, entry_point, add_native_executable)
|
||||
ulp_cmake_dir = idf_path / 'components' / 'ulp' / 'cmake'
|
||||
ulp_subproject_dir = idf_path / 'components' / 'ulp' / 'subproject'
|
||||
|
||||
cmake_args = (
|
||||
'cmake',
|
||||
@@ -126,8 +126,8 @@ def test_ulp_cmake_api_availability(
|
||||
_cmake_path(project_dir),
|
||||
'-B',
|
||||
_cmake_path(build_dir),
|
||||
f'-DCMAKE_MODULE_PATH={_cmake_path(ulp_cmake_dir)}',
|
||||
f'-DCMAKE_TOOLCHAIN_FILE={_cmake_path(ulp_cmake_dir / "toolchain-lp-core-riscv.cmake")}',
|
||||
f'-DCMAKE_MODULE_PATH={_cmake_path(ulp_subproject_dir)}',
|
||||
f'-DCMAKE_TOOLCHAIN_FILE={_cmake_path(ulp_subproject_dir / "toolchain-lp-core-riscv.cmake")}',
|
||||
f'-DIDF_PATH={_cmake_path(idf_path)}',
|
||||
'-DIDF_TARGET=esp32c6',
|
||||
f'-DSDKCONFIG_CMAKE={_cmake_path(project_dir / "sdkconfig.cmake")}',
|
||||
|
||||
Reference in New Issue
Block a user