From c584887b5bd17b29971ba44f0e0ad71207759480 Mon Sep 17 00:00:00 2001
From: Lorenzo Leone <lleone@iis.ee.ethz.ch>
Date: Fri, 27 Sep 2024 08:16:15 +0200
Subject: [PATCH] Add bootrom build target for chimera

---
 Bender.lock | 4 ++--
 Bender.yml  | 2 +-
 chimera.mk  | 2 +-
 sw/sw.mk    | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Bender.lock b/Bender.lock
index 43725aa..a3551ba 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -69,7 +69,7 @@ packages:
     - common_cells
     - register_interface
   cheshire:
-    revision: e9fbb914f4f13cb8a52f86780570a292d8aed647
+    revision: 2eaec75db7bf8e1956ec685608e05dc694512da8
     version: null
     source:
       Git: https://github.com/pulp-platform/cheshire.git
@@ -140,7 +140,7 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   cva6:
-    revision: 637a0e6cbc8ec395c4bb4f54ee9dc1110d3fb1ac
+    revision: 630bd959c9cc69a35d461a2abc205310d2edacf8
     version: null
     source:
       Git: https://github.com/Scheremo/cva6.git
diff --git a/Bender.yml b/Bender.yml
index 5640418..b62db2d 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -11,7 +11,7 @@ package:
 dependencies:
   register_interface:       { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.3  }
   axi:                      { git: "https://github.com/pulp-platform/axi.git",                version: 0.39.2 }
-  cheshire:                 { git: "https://github.com/pulp-platform/cheshire.git",           rev: e9fbb914f4f13cb8a52f86780570a292d8aed647}
+  cheshire:                 { git: "https://github.com/pulp-platform/cheshire.git",           rev: lleone/memisland}
   snitch_cluster:           { git: "https://github.com/pulp-platform/snitch_cluster.git",     rev: c12ce9b2af1ac8edf3d4feb18939e1ad20c42225}
   common_cells:             { git: "https://github.com/pulp-platform/common_cells.git",       version: 1.31.1}
   idma:                     { git: "https://github.com/pulp-platform/iDMA.git",               rev: 9edf489f57389dce5e71252c79e337f527d3aded}
diff --git a/chimera.mk b/chimera.mk
index c5d59fd..04d94cb 100644
--- a/chimera.mk
+++ b/chimera.mk
@@ -65,7 +65,7 @@ $(CHIM_ROOT)/hw/regs/chimera_reg_pkg.sv $(CHIM_ROOT)/hw/regs/chimera_reg_top.sv:
 # Nonfree components
 CHIM_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/chimera-nonfree.git
 CHIM_NONFREE_DIR ?= $(CHIM_ROOT)/nonfree
-CHIM_NONFREE_COMMIT ?= 0825231dfb56fb1ab387d86c4b13bcad7c2fbee9 # to deploy `chimera-nonfree` repo changes, push to `deploy` tag
+CHIM_NONFREE_COMMIT ?= 4ad18f61e8db277f9a9d9c7c01ef5d5769552d2c # to deploy `chimera-nonfree` repo changes, push to `deploy` tag
 
 .PHONY: chim-nonfree-init
 chim-nonfree-init:
diff --git a/sw/sw.mk b/sw/sw.mk
index 4bf42de..b15dadb 100644
--- a/sw/sw.mk
+++ b/sw/sw.mk
@@ -53,6 +53,11 @@ $(foreach link,$(patsubst $(CHS_SW_LD_DIR)/%.ld,%,$(wildcard $(CHS_SW_LD_DIR)/*.
 
 chim-sw: $(CHIM_SW_LIB) $(CHIM_SW_TESTS)
 
+.PHONY: chim-bootrom-init
+chim-bootrom-init: chs-hw-init chim-sw
+	make -B chs-bootrom-all CHS_XLEN=$(CHS_XLEN) CHS_SW_LD_DIR=$(CHS_SW_LD_DIR)
+
+
 chim-sw-clean:
 	@find sw/tests | grep ".*\.elf" | xargs -I ! rm !
 	@find sw/tests | grep ".*\.dump" | xargs -I ! rm !