Kaynağa Gözat

cmake: also pass IDF_ENV_FPGA in config.env

Ivan Grokhotkov 5 yıl önce
ebeveyn
işleme
b736eebf90
2 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 1 2
      tools/cmake/kconfig.cmake
  2. 1 0
      tools/kconfig_new/config.env.in

+ 1 - 2
tools/cmake/kconfig.cmake

@@ -140,6 +140,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
 
     idf_build_get_property(idf_target IDF_TARGET)
     idf_build_get_property(idf_path IDF_PATH)
+    idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
 
     string(REPLACE ";" " " kconfigs "${kconfigs}")
     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)
     endif()
 
-    idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
-
     # Generate the menuconfig target
     add_custom_target(menuconfig
         ${menuconfig_depends}

+ 1 - 0
tools/kconfig_new/config.env.in

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