espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: also pass IDF_ENV_FPGA in config.env

Browse Source
This commit is contained in:
Ivan Grokhotkov
2020-06-26 11:37:34 +02:00
parent 0bace4e0ca
commit b736eebf90
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/cmake/kconfig.cmake
View File

@@ -140,6 +140,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
idf_build_get_property(idf_target IDF_TARGET) idf_build_get_property(idf_target IDF_TARGET)
idf_build_get_property(idf_path IDF_PATH) idf_build_get_property(idf_path IDF_PATH)
idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
string(REPLACE ";" " " kconfigs "${kconfigs}") string(REPLACE ";" " " kconfigs "${kconfigs}")
string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}") string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}")
@@ -259,8 +260,6 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
set(TERM_CHECK_CMD ${python} ${idf_path}/tools/check_term.py) set(TERM_CHECK_CMD ${python} ${idf_path}/tools/check_term.py)
endif() endif()
idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
# Generate the menuconfig target # Generate the menuconfig target
add_custom_target(menuconfig add_custom_target(menuconfig
${menuconfig_depends} ${menuconfig_depends}

1
tools/kconfig_new/config.env.in
View File

@@ -4,6 +4,7 @@
"COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}", "COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}",
"IDF_CMAKE": "y", "IDF_CMAKE": "y",
"IDF_TARGET": "${idf_target}", "IDF_TARGET": "${idf_target}",
"IDF_ENV_FPGA": "${idf_env_fpga}",
"IDF_PATH": "${idf_path}", "IDF_PATH": "${idf_path}",
"COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}", "COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}",
"COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}" "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}"