Skip to content

Commit e8fef0a

Browse files
authored
enable bootloader components build
1 parent 04b83e3 commit e8fef0a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

builder/frameworks/espidf.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,11 @@ def populate_idf_env_vars(idf_env):
252252
os.path.dirname(get_python_exe()),
253253
]
254254

255-
if mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"):
256-
additional_packages.append(
257-
os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
258-
)
255+
# if mcu in ("esp32", "esp32s2", "esp32s3"):
256+
# additional_packages.append(
257+
# os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
258+
# )
259259

260-
# if IS_WINDOWS:
261-
# additional_packages.append(platform.get_package_dir("tool-mconf"))
262260

263261
idf_env["PATH"] = os.pathsep.join(additional_packages + [idf_env["PATH"]])
264262

@@ -875,6 +873,7 @@ def build_bootloader(sdk_config):
875873
"-DPYTHON=" + get_python_exe(),
876874
"-DIDF_PATH=" + FRAMEWORK_DIR,
877875
"-DSDKCONFIG=" + SDKCONFIG_PATH,
876+
"-DPROJECT_SOURCE_DIR=" + PROJECT_DIR,
878877
"-DLEGACY_INCLUDE_COMMON_HEADERS=",
879878
"-DEXTRA_COMPONENT_DIRS="
880879
+ os.path.join(FRAMEWORK_DIR, "components", "bootloader"),
@@ -1787,8 +1786,8 @@ def _skip_prj_source_files(node):
17871786
#
17881787

17891788
ulp_dir = os.path.join(PROJECT_DIR, "ulp")
1790-
if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"):
1791-
env.SConscript("ulp.py", exports="env sdk_config project_config idf_variant")
1789+
if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32h2"):
1790+
env.SConscript("ulp.py", exports="env sdk_config project_config app_includes idf_variant")
17921791

17931792
#
17941793
# Process OTA partition and image

0 commit comments

Comments
 (0)