fix ULP LP compile

Jason2866 · Sep 16, 2024 · 47395cd · 47395cd
1 parent aa76a86
commit 47395cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -1787,7 +1787,7 @@ def _skip_prj_source_files(node):
 
 ulp_dir = os.path.join(PROJECT_DIR, "ulp")
 if os.path.isdir(ulp_dir) and os.listdir(ulp_dir) and mcu not in ("esp32c2", "esp32c3", "esp32h2"):
-    env.SConscript("ulp.py", exports="env sdk_config project_config idf_variant")
+    env.SConscript("ulp.py", exports="env sdk_config project_config app_includes idf_variant")
 
 #
 # Process OTA partition and image

diff --git a/builder/frameworks/ulp.py b/builder/frameworks/ulp.py
@@ -21,7 +21,7 @@
 
 from SCons.Script import Import
 
-Import("env sdk_config project_config idf_variant")
+Import("env sdk_config project_config app_includes idf_variant")
 
 ulp_env = env.Clone()
 platform = ulp_env.PioPlatform()
@@ -93,6 +93,10 @@ def _generate_ulp_configuration_action(env, target, source):
         else:
             ulp_toolchain = "toolchain-lp-core-riscv.cmake"
 
+        comp_includes = ";".join(get_component_includes(target_config))
+        plain_includes = ";".join(app_includes["plain_includes"])
+        comp_includes = comp_includes + plain_includes
+
         cmd = (
             os.path.join(platform.get_package_dir("tool-cmake"), "bin", "cmake"),
             "-DCMAKE_GENERATOR=Ninja",
@@ -107,7 +111,7 @@ def _generate_ulp_configuration_action(env, target, 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)),
+            "-DCOMPONENT_INCLUDES=" + comp_includes,
             "-DIDF_TARGET=%s" % idf_variant,
             "-DIDF_PATH=" + fs.to_unix_path(FRAMEWORK_DIR),
             "-DSDKCONFIG_HEADER=" + os.path.join(BUILD_DIR, "config", "sdkconfig.h"),