Merge branch 'staging-newer' of github.com:tum-ei-eda/mlonmcu into st…

…aging-newer
tum-ei-eda · Nov 14, 2023 · 6d6a605 · 6d6a605
2 parents e67d717 + 500b294
commit 6d6a605
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mlonmcu/setup/tasks/etiss.py b/mlonmcu/setup/tasks/etiss.py
@@ -125,8 +125,8 @@ def install_etiss(
         return False
     flags = utils.makeFlags((params["dbg"], "dbg"))
     # etissName = utils.makeDirName("etiss", flags=flags)
-    etissBuildDir = context.cache["etiss.build_dir", flags]
-    etissInstallDir = context.cache["etiss.install_dir", flags]
+    etissBuildDir = Path(context.cache["etiss.build_dir", flags])
+    etissInstallDir = Path(context.cache["etiss.install_dir", flags])
     etissvpExe = etissInstallDir / "bin" / "bare_etiss_processor"
     etissvpScript = etissInstallDir / "bin" / "run_helper.sh"
     if rebuild or not utils.is_populated(etissInstallDir) or not etissvpExe.is_file():

diff --git a/resources/templates/corev.yml.j2 b/resources/templates/corev.yml.j2
@@ -46,7 +46,7 @@ repos:
         - 3rdparty/rang
   etiss:
     url: "https://github.com/tum-ei-eda/etiss.git"
-    ref: db52781b01421491d01efec5dab8e81859c6afe9
+    ref: b6143de5e63ef90d7bd85541d124cf097969e96a
   muriscvnn:
     url: "https://github.com/tum-ei-eda/muriscv-nn.git"
     ref: 29b1d52dddc170579cab1b9510a2749ac03da3d6
@@ -68,7 +68,7 @@ repos:
     ref: 35ce20560794ddc9e6d87006cad7a3bc665f8319  # v4.0.0 + portability patch
   mlif:
     url: "https://github.com/tum-ei-eda/mlonmcu-sw.git"
-    ref: 6116349b574e3961f57ac41af7882596ec938d91
+    ref: 00dc07c675fa4be01726fc2238d2024becacbec2
   microtvm_etiss:
     url: "https://github.com/PhilippvK/microtvm-etiss-template.git"
     ref: 4460f539f6607b0c8b90321e7cb80e28d1e1fbe2