ULP compability for IDF 5.3

builder/frameworks/ulp.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import os
+import sys
 
 from platformio import fs
 from platformio.util import get_systype
@@ -34,11 +35,12 @@ ULP_BUILD_DIR = os.path.join(
 def prepare_ulp_env_vars(env):
     ulp_env.PrependENVPath("IDF_PATH", FRAMEWORK_DIR)
 
+    toolchain_path = platform.get_package_dir(
+        "toolchain-xtensa-esp-elf"
+    )
+
     additional_packages = [
-        os.path.join(
-            platform.get_package_dir("toolchain-xtensa-%s" % idf_variant),
-            "bin",
-        ),
+        toolchain_path,
         os.path.join(
             platform.get_package_dir("toolchain-esp32ulp"),
             "bin",
@@ -57,7 +59,7 @@ def prepare_ulp_env_vars(env):
 
 def collect_ulp_sources():
     return [
-        fs.to_unix_path(os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp", f))
+        os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp", f)
         for f in os.listdir(os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp"))
         if f.endswith((".c", ".S", ".s"))
     ]
@@ -95,7 +97,7 @@ def generate_ulp_config(target_config):
                     "-riscv" if riscv_ulp_enabled else "",
                 ),
             ),
-            "-DULP_S_SOURCES=%s" % ";".join([s.get_abspath() for s in source]),
+            "-DULP_S_SOURCES=%s" % ";".join([fs.to_unix_path(s.get_abspath()) for s in source]),
             "-DULP_APP_NAME=ulp_main",
             "-DCOMPONENT_DIR=" + os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp"),
             "-DCOMPONENT_INCLUDES=%s" % ";".join(get_component_includes(target_config)),
@@ -110,7 +112,12 @@ def generate_ulp_config(target_config):
             os.path.join(FRAMEWORK_DIR, "components", "ulp", "cmake"),
         )
 
-        exec_command(cmd)
+        print(555, cmd)
+
+        result = exec_command(cmd)
+        if result["returncode"] != 0:
+            sys.stderr.write(result["err"] + "\n")
+            env.Exit(1)
 
     ulp_sources = collect_ulp_sources()
     ulp_sources.sort()