@@ -252,13 +252,11 @@ def populate_idf_env_vars(idf_env):
252
252
os .path .dirname (get_python_exe ()),
253
253
]
254
254
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
+ # )
259
259
260
- # if IS_WINDOWS:
261
- # additional_packages.append(platform.get_package_dir("tool-mconf"))
262
260
263
261
idf_env ["PATH" ] = os .pathsep .join (additional_packages + [idf_env ["PATH" ]])
264
262
@@ -875,6 +873,7 @@ def build_bootloader(sdk_config):
875
873
"-DPYTHON=" + get_python_exe (),
876
874
"-DIDF_PATH=" + FRAMEWORK_DIR ,
877
875
"-DSDKCONFIG=" + SDKCONFIG_PATH ,
876
+ "-DPROJECT_SOURCE_DIR=" + PROJECT_DIR ,
878
877
"-DLEGACY_INCLUDE_COMMON_HEADERS=" ,
879
878
"-DEXTRA_COMPONENT_DIRS="
880
879
+ os .path .join (FRAMEWORK_DIR , "components" , "bootloader" ),
@@ -1787,8 +1786,8 @@ def _skip_prj_source_files(node):
1787
1786
#
1788
1787
1789
1788
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" )
1792
1791
1793
1792
#
1794
1793
# Process OTA partition and image
0 commit comments