From 3cd8c5f69ca8f9a259b3213490810c82064b29aa Mon Sep 17 00:00:00 2001
From: Francesco Conti <f.conti@unibo.it>
Date: Thu, 6 Aug 2026 17:25:16 +0200
Subject: [PATCH 1/2] Use UNIBO infrastructure for CI

This commit switches magia to use unibo-based infrastructure instead
of iis-git.
---
 .github/workflows/gitlab-ci.yml | 6 +++---
 Makefile                        | 6 +++---
 magia-sdk                       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml
index ed3416c6..da0a5d86 100644
--- a/.github/workflows/gitlab-ci.yml
+++ b/.github/workflows/gitlab-ci.yml
@@ -22,8 +22,8 @@ jobs:
         # Skip on forks or pull requests from forks due to missing secrets.
         if: github.repository == 'pulp-platform/MAGIA' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         with:
-          domain: iis-git.ee.ethz.ch
-          repo: github-mirror/magia
-          token: ${{ secrets.GITLAB_TOKEN }}
+          domain: ${{ secrets.GITLAB_UNIBO_SERVER }}
+          repo: github-mirror/MAGIA
+          token: ${{ secrets.GITLAB_UNIBO_TOKEN }}
           poll-count: 1000
           poll-period: 60
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0ee5b8ec..e10fdfaa 100644
--- a/Makefile
+++ b/Makefile
@@ -423,7 +423,7 @@ ifeq ($(core), RI5CY)
 else
 	@sed -i '/^  cv32e40p:$$/,/^  cv32e40x:/ { s|^    revision: .*|    revision: $(CV32E40P_REV)|; 			s|^      Git: .*|      Git: $(CV32E40P_GIT)|; 		}' Bender.lock
 endif
-	$(BENDER) update
+	$(BENDER) checkout
 	$(BENDER) script vsim          \
 	--vlog-arg="$(compile_flag)"   \
 	--vcom-arg="-pedanticerrors"   \
@@ -571,9 +571,9 @@ hw-clean:
 hw-all: hw-clean hw-lib hw-compile hw-opt
 
 # Nonfree components
-MAGIA_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/magia-nonfree
+MAGIA_NONFREE_REMOTE ?= $(GITLAB_UNIBO_SSH_STRING)/magia/nonfree.git
 MAGIA_NONFREE_DIR ?= nonfree
-MAGIA_NONFREE_COMMIT ?= 825ec37e40a1b46749cbcd59ff77f75d7a8f0296
+MAGIA_NONFREE_COMMIT ?= 80125ef82668544234d2f2783a845c70349a3e8c
 
 .PHONY: magia-nonfree-init
 MAGIA_NONFREE_DEPS ?= 1
diff --git a/magia-sdk b/magia-sdk
index 6f1b4831..7525dd2b 160000
--- a/magia-sdk
+++ b/magia-sdk
@@ -1 +1 @@
-Subproject commit 6f1b483110f6234f1f89671b3da7e9b446c84426
+Subproject commit 7525dd2b8d9245a67737a279a5dd15927b7230ad

From 4333bb5791dd3d0f361788f7ba2c4be965585936 Mon Sep 17 00:00:00 2001
From: Riccardo Fiorani Gallotta <riccardo.fiorani3@unibo.it>
Date: Thu, 20 Aug 2026 23:55:41 +0200
Subject: [PATCH 2/2] [CI] Bump nonfree repo commit and fix elab issue

---
 Bender.yml | 1 +
 Makefile   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bender.yml b/Bender.yml
index 05746f23..ebb50a06 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -233,6 +233,7 @@ sources:
       - hw/tile/spatz_cc_wrapper.sv
       - hw/tile/core_data_demux_eu_direct.sv
       - hw/tile/eu_direct_cut.sv
+      - hw/tile/magia_tile_icache_wrap.sv
       - hw/tile/magia_redmule_wrap.sv
       - hw/tile/magia_tile.sv
       # MAGIA
diff --git a/Makefile b/Makefile
index e10fdfaa..ff1c29bb 100644
--- a/Makefile
+++ b/Makefile
@@ -572,11 +572,12 @@ hw-all: hw-clean hw-lib hw-compile hw-opt
 
 # Nonfree components
 MAGIA_NONFREE_REMOTE ?= $(GITLAB_UNIBO_SSH_STRING)/magia/nonfree.git
-MAGIA_NONFREE_DIR ?= nonfree
-MAGIA_NONFREE_COMMIT ?= 80125ef82668544234d2f2783a845c70349a3e8c
+MAGIA_NONFREE_DIR    ?= nonfree
+MAGIA_NONFREE_COMMIT ?= 85b1df9cedbe7a52a361c05fea9181e084e2b4c8
+MAGIA_NONFREE_DEPS   ?= 1
 
 .PHONY: magia-nonfree-init
-MAGIA_NONFREE_DEPS ?= 1
+
 magia-nonfree-init:
 	git clone $(MAGIA_NONFREE_REMOTE) $(MAGIA_NONFREE_DIR)
 	cd $(MAGIA_NONFREE_DIR) && git checkout $(MAGIA_NONFREE_COMMIT)