From a00c959708f1420df1f4ec87f9e83d7d328ce278 Mon Sep 17 00:00:00 2001 From: Philipp van Kempen Date: Tue, 7 Nov 2023 08:11:35 +0100 Subject: [PATCH 1/3] corev.yml.j2: update mlif ref --- resources/templates/corev.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/corev.yml.j2 b/resources/templates/corev.yml.j2 index 4f9fd315a..f8f9fd7ad 100644 --- a/resources/templates/corev.yml.j2 +++ b/resources/templates/corev.yml.j2 @@ -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: 5da8f8f7e3d9a105bc9464f440a6ee855a32d62e microtvm_etiss: url: "https://github.com/PhilippvK/microtvm-etiss-template.git" ref: 4460f539f6607b0c8b90321e7cb80e28d1e1fbe2 From 8ad8421abd36d678c9f65833add72ae230dbb638 Mon Sep 17 00:00:00 2001 From: Philipp van Kempen Date: Fri, 10 Nov 2023 09:05:46 +0100 Subject: [PATCH 2/3] fix minor etiss setup bug --- mlonmcu/setup/tasks/etiss.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mlonmcu/setup/tasks/etiss.py b/mlonmcu/setup/tasks/etiss.py index ee290d6fc..93f73ad86 100644 --- 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(): From 500b294e7d84b1a9b2ad4a4f3754c06773c09988 Mon Sep 17 00:00:00 2001 From: Philipp van Kempen Date: Fri, 10 Nov 2023 09:06:07 +0100 Subject: [PATCH 3/3] corev.yml.j2: update mlif+etiss ref --- resources/templates/corev.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/corev.yml.j2 b/resources/templates/corev.yml.j2 index f8f9fd7ad..12753daa1 100644 --- 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: 5da8f8f7e3d9a105bc9464f440a6ee855a32d62e + ref: 00dc07c675fa4be01726fc2238d2024becacbec2 microtvm_etiss: url: "https://github.com/PhilippvK/microtvm-etiss-template.git" ref: 4460f539f6607b0c8b90321e7cb80e28d1e1fbe2