diff --git a/tools/cmakev2/kconfig.cmake b/tools/cmakev2/kconfig.cmake index f62f297765..8f5d9a6b14 100644 --- a/tools/cmakev2/kconfig.cmake +++ b/tools/cmakev2/kconfig.cmake @@ -338,7 +338,7 @@ function(__create_config_env_file env_path) idf_build_set_property(__IDF_ENV_FPGA "${idf_env_fpga}") # Get the config.env.in template path - set(template_path "${idf_path}/tools/kconfig_new/config.env.in") + set(template_path "${idf_path}/tools/kconfig_new/config_buildv2.env.in") if(NOT EXISTS "${template_path}") idf_die("Kconfig environment template file not found at ${template_path}") endif() diff --git a/tools/kconfig_new/config.env.in b/tools/kconfig_new/config.env.in index 51245f6be9..962f02e4b8 100644 --- a/tools/kconfig_new/config.env.in +++ b/tools/kconfig_new/config.env.in @@ -2,15 +2,11 @@ "COMPONENT_KCONFIGS": "${kconfigs}", "COMPONENT_KCONFIGS_PROJBUILD": "${kconfig_projbuilds}", "COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}", - "COMPONENT_KCONFIGS_EXCLUDED": "${kconfigs_excluded}", - "COMPONENT_KCONFIGS_PROJBUILD_EXCLUDED": "${kconfigs_projbuild_excluded}", "IDF_TARGET": "${idf_target}", "IDF_TOOLCHAIN": "${idf_toolchain}", "IDF_VERSION": "$ENV{IDF_VERSION}", "IDF_ENV_FPGA": "${idf_env_fpga}", "IDF_PATH": "${idf_path}", "COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}", - "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}", - "COMPONENT_KCONFIGS_EXCLUDED_SOURCE_FILE": "${kconfigs_excluded_path}", - "COMPONENT_KCONFIGS_PROJBUILD_EXCLUDED_SOURCE_FILE": "${kconfigs_projbuild_excluded_path}" + "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}" } diff --git a/tools/kconfig_new/config_buildv2.env.in b/tools/kconfig_new/config_buildv2.env.in new file mode 100644 index 0000000000..51245f6be9 --- /dev/null +++ b/tools/kconfig_new/config_buildv2.env.in @@ -0,0 +1,16 @@ +{ + "COMPONENT_KCONFIGS": "${kconfigs}", + "COMPONENT_KCONFIGS_PROJBUILD": "${kconfig_projbuilds}", + "COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}", + "COMPONENT_KCONFIGS_EXCLUDED": "${kconfigs_excluded}", + "COMPONENT_KCONFIGS_PROJBUILD_EXCLUDED": "${kconfigs_projbuild_excluded}", + "IDF_TARGET": "${idf_target}", + "IDF_TOOLCHAIN": "${idf_toolchain}", + "IDF_VERSION": "$ENV{IDF_VERSION}", + "IDF_ENV_FPGA": "${idf_env_fpga}", + "IDF_PATH": "${idf_path}", + "COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}", + "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}", + "COMPONENT_KCONFIGS_EXCLUDED_SOURCE_FILE": "${kconfigs_excluded_path}", + "COMPONENT_KCONFIGS_PROJBUILD_EXCLUDED_SOURCE_FILE": "${kconfigs_projbuild_excluded_path}" +}