From b736eebf902ac637bab62fd74b1a424c51ef4da3 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 26 Jun 2020 11:37:34 +0200
Subject: [PATCH] cmake: also pass IDF_ENV_FPGA in config.env

---
 tools/cmake/kconfig.cmake       | 3 +--
 tools/kconfig_new/config.env.in | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake
index 6d8f18a6c..8db65bdbf 100644
--- a/tools/cmake/kconfig.cmake
+++ b/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}
diff --git a/tools/kconfig_new/config.env.in b/tools/kconfig_new/config.env.in
index 681115dcd..292442d5c 100644
--- a/tools/kconfig_new/config.env.in
+++ b/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}"