From e8fef0a6c7ece79e222f09180fbae5dd00ebbe80 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:11:32 +0200 Subject: [PATCH] enable bootloader components build --- builder/frameworks/espidf.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index cfabb28..6c55774 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -252,13 +252,11 @@ def populate_idf_env_vars(idf_env): os.path.dirname(get_python_exe()), ] - if mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"): - additional_packages.append( - os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"), - ) +# if mcu in ("esp32", "esp32s2", "esp32s3"): +# additional_packages.append( +# os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"), +# ) -# if IS_WINDOWS: -# additional_packages.append(platform.get_package_dir("tool-mconf")) idf_env["PATH"] = os.pathsep.join(additional_packages + [idf_env["PATH"]]) @@ -875,6 +873,7 @@ def build_bootloader(sdk_config): "-DPYTHON=" + get_python_exe(), "-DIDF_PATH=" + FRAMEWORK_DIR, "-DSDKCONFIG=" + SDKCONFIG_PATH, + "-DPROJECT_SOURCE_DIR=" + PROJECT_DIR, "-DLEGACY_INCLUDE_COMMON_HEADERS=", "-DEXTRA_COMPONENT_DIRS=" + os.path.join(FRAMEWORK_DIR, "components", "bootloader"), @@ -1787,8 +1786,8 @@ env["BUILDERS"]["ElfToBin"].action = action # ulp_dir = os.path.join(PROJECT_DIR, "ulp") -if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"): - env.SConscript("ulp.py", exports="env sdk_config project_config idf_variant") +if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32h2"): + env.SConscript("ulp.py", exports="env sdk_config project_config app_includes idf_variant") # # Process OTA partition and image