From 0158a727b99d47d19534a2d620e778948a866a85 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 9 Jan 2023 11:06:18 +0100 Subject: [PATCH] Fix ULP RISCV toolchain file selection (#993) --- builder/frameworks/ulp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/frameworks/ulp.py b/builder/frameworks/ulp.py index 974a729..416b5b2 100644 --- a/builder/frameworks/ulp.py +++ b/builder/frameworks/ulp.py @@ -77,7 +77,7 @@ def get_component_includes(target_config): def generate_ulp_config(target_config): - riscv_ulp_enabled = sdk_config.get("ESP32S2_ULP_COPROC_RISCV", False) + riscv_ulp_enabled = sdk_config.get("ULP_COPROC_TYPE_RISCV", False) ulp_sources = collect_ulp_sources() ulp_sources.sort() @@ -90,8 +90,8 @@ def generate_ulp_config(target_config): "components", "ulp", "cmake", - "toolchain-%s-ulp%s.cmake" - % (idf_variant, "-riscv" if riscv_ulp_enabled else ""), + "toolchain-%sulp%s.cmake" + % ("" if riscv_ulp_enabled else idf_variant + "-", "-riscv" if riscv_ulp_enabled else ""), ), '-DULP_S_SOURCES="%s"' % ";".join(ulp_sources), "-DULP_APP_NAME=ulp_main",