@@ -250,13 +250,11 @@ def populate_idf_env_vars(idf_env):
250
250
os .path .dirname (get_python_exe ()),
251
251
]
252
252
253
- if mcu not in ("esp32c2 " , "esp32c3 " , "esp32c6" , "esp32h2" , "esp32p4 " ):
254
- additional_packages .append (
255
- os .path .join (platform .get_package_dir ("toolchain-esp32ulp" ), "bin" ),
256
- )
253
+ # if mcu in ("esp32 ", "esp32s2 ", "esp32s3 "):
254
+ # additional_packages.append(
255
+ # os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
256
+ # )
257
257
258
- # if IS_WINDOWS:
259
- # additional_packages.append(platform.get_package_dir("tool-mconf"))
260
258
261
259
idf_env ["PATH" ] = os .pathsep .join (additional_packages + [idf_env ["PATH" ]])
262
260
@@ -1300,17 +1298,6 @@ def _get_installed_pip_packages(python_exe_path):
1300
1298
)
1301
1299
)
1302
1300
1303
- # # A special "esp-windows-curses" python package is required on Windows
1304
- # # for Menuconfig on IDF <5
1305
- # if not IDF5 and "esp-windows-curses" not in installed_packages:
1306
- # env.Execute(
1307
- # env.VerboseAction(
1308
- # '"%s" -m pip install "file://%s/tools/kconfig_new/esp-windows-curses"'
1309
- # % (python_exe_path, FRAMEWORK_DIR),
1310
- # "Installing windows-curses package",
1311
- # )
1312
- # )
1313
-
1314
1301
1315
1302
def get_idf_venv_dir ():
1316
1303
# The name of the IDF venv contains the IDF version to avoid possible conflicts and
@@ -1786,8 +1773,8 @@ def _skip_prj_source_files(node):
1786
1773
#
1787
1774
1788
1775
ulp_dir = os .path .join (PROJECT_DIR , "ulp" )
1789
- if os .path .isdir (ulp_dir ) and os .listdir (ulp_dir ) and mcu not in ("esp32c2" , "esp32c3" , "esp32c6" , " esp32h2" , "esp32p4 " ):
1790
- env .SConscript ("ulp.py" , exports = "env sdk_config project_config idf_variant" )
1776
+ if os .path .isdir (ulp_dir ) and os .listdir (ulp_dir ) and mcu not in ("esp32c2" , "esp32c3" , "esp32h2" ):
1777
+ env .SConscript ("ulp.py" , exports = "env sdk_config project_config app_includes idf_variant" )
1791
1778
1792
1779
#
1793
1780
# Process OTA partition and image
0 commit comments