Skip to content

Commit 95bbc10

Browse files
authored
enable bootloader components build
1 parent 352c004 commit 95bbc10

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

builder/frameworks/espidf.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,6 @@ def populate_idf_env_vars(idf_env):
250250
os.path.dirname(get_python_exe()),
251251
]
252252

253-
if mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"):
254-
additional_packages.append(
255-
os.path.join(platform.get_package_dir("esp32ulp-elf"), "bin"),
256-
)
257-
258253
idf_env["PATH"] = os.pathsep.join(additional_packages + [idf_env["PATH"]])
259254

260255
# Some users reported that the `IDF_TOOLS_PATH` var can seep into the
@@ -870,6 +865,7 @@ def build_bootloader(sdk_config):
870865
"-DPYTHON=" + get_python_exe(),
871866
"-DIDF_PATH=" + FRAMEWORK_DIR,
872867
"-DSDKCONFIG=" + SDKCONFIG_PATH,
868+
"-DPROJECT_SOURCE_DIR=" + PROJECT_DIR,
873869
"-DLEGACY_INCLUDE_COMMON_HEADERS=",
874870
"-DEXTRA_COMPONENT_DIRS="
875871
+ os.path.join(FRAMEWORK_DIR, "components", "bootloader"),
@@ -1771,8 +1767,8 @@ def _skip_prj_source_files(node):
17711767
#
17721768

17731769
ulp_dir = os.path.join(PROJECT_DIR, "ulp")
1774-
if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"):
1775-
env.SConscript("ulp.py", exports="env sdk_config project_config idf_variant")
1770+
if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32h2"):
1771+
env.SConscript("ulp.py", exports="env sdk_config project_config app_includes idf_variant")
17761772

17771773
#
17781774
# Process OTA partition and image

0 commit comments

Comments
 (0)