From a383428d92274622fa528d71afc3c5cfc2f30ebb Mon Sep 17 00:00:00 2001
From: aottaviano <aottaviano@iis.ee.ethz.ch>
Date: Sat, 12 Aug 2023 07:51:31 +0200
Subject: [PATCH] treewide: Bump pulp cluster and related dependencies

* Fix address issue. Data/Periph demux did not consider the cluster
* Force hier-icache in Bender.local
* Bump SCM
* Update bender targets and defines for scripts generation
---
 Bender.local     |  4 ++--
 Bender.lock      | 12 ++++++------
 Bender.yml       |  2 +-
 bender-common.mk |  2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Bender.local b/Bender.local
index ae2bc257..709a8b3d 100644
--- a/Bender.local
+++ b/Bender.local
@@ -11,8 +11,8 @@ overrides:
   tech_cells_generic:   { git: "https://github.com/pulp-platform/tech_cells_generic.git"  , version: =0.2.12                                }
   riscv-dbg:            { git: "https://github.com/pulp-platform/riscv-dbg.git"           , version: =0.8.0                                 }
   idma:                 { git: "https://github.com/pulp-platform/idma.git"                , rev:     437ffa9                                }
-  hier-icache:          { git: "https://github.com/pulp-platform/hier-icache.git"         , rev: a7e3f4e4c7fe607bcd6b9d94db77f612fd6ef6be   }
-  scm:                  { git: "https://github.com/pulp-platform/scm.git"                 , rev: f7b51416f3c407e4c31e9c016616d57aae2687bd   }
+  hier-icache:          { git: "https://github.com/pulp-platform/hier-icache.git"         , rev: fac03040e4901daad29c141fc481f7c5d3758e99   }
+  scm:                  { git: "https://github.com/pulp-platform/scm.git"                 , rev: 74426dee36f28ae1c02f7635cf844a0156145320   }
   cluster_interconnect: { git: "https://github.com/pulp-platform/cluster_interconnect.git", rev: 89e1019d64a86425211be6200770576cbdf3e8b3   } # branch: assertion-fix
   clic:                 { git: "https://github.com/pulp-platform/clic.git"                , rev: bed98f8 }
   fpnew:                { git: "https://github.com/pulp-platform/cvfpu.git"               , rev: pulp-v0.1.3 }
diff --git a/Bender.lock b/Bender.lock
index 5e63cc7e..39546f68 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -261,7 +261,7 @@ packages:
     - hwpe-stream
     - l2_tcdm_hybrid_interco
   hier-icache:
-    revision: a7e3f4e4c7fe607bcd6b9d94db77f612fd6ef6be
+    revision: fac03040e4901daad29c141fc481f7c5d3758e99
     version: null
     source:
       Git: https://github.com/pulp-platform/hier-icache.git
@@ -273,8 +273,8 @@ packages:
     - scm
     - tech_cells_generic
   hwpe-ctrl:
-    revision: 3d9b9bea7b98df24e6b235408364521a1a27d561
-    version: 1.7.2
+    revision: b7857919ea14b586901ff4282ad7749a3d50501e
+    version: null
     source:
       Git: https://github.com/pulp-platform/hwpe-ctrl.git
     dependencies:
@@ -382,7 +382,7 @@ packages:
     dependencies:
     - axi_slice
   pulp_cluster:
-    revision: 201453dbcedc8f7235b2723363356ba5845e5120
+    revision: 78c7e4b188151c7790bb1422b9aeeb28f5e0b588
     version: null
     source:
       Git: https://github.com/pulp-platform/pulp_cluster.git
@@ -411,7 +411,7 @@ packages:
     - tech_cells_generic
     - timer_unit
   redmule:
-    revision: 3797413e5f190c2a86185ab6d8b12af365051b1e
+    revision: 886ad5ecf5fd908e0c0b278c22914a76a704eda3
     version: null
     source:
       Git: https://github.com/pulp-platform/redmule.git
@@ -482,7 +482,7 @@ packages:
     - tech_cells_generic
     - timer_unit
   scm:
-    revision: f7b51416f3c407e4c31e9c016616d57aae2687bd
+    revision: 74426dee36f28ae1c02f7635cf844a0156145320
     version: null
     source:
       Git: https://github.com/pulp-platform/scm.git
diff --git a/Bender.yml b/Bender.yml
index e3eda54a..f6e733f1 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -16,7 +16,7 @@ dependencies:
   hyperbus:           { git: https://github.com/pulp-platform/hyperbus.git,             rev: 2adb7271438cdb96c19fbaf3e2a6bf89ffeee568 } # branch: lv/phys_in_use
   car_l2:             { git: git@iis-git.ee.ethz.ch:carfield/carfield_l2_mem.git,       rev: d6ab486b2777bf78c38b49352b5977565a272a58 } # branch: main
   safety_island:      { git: git@iis-git.ee.ethz.ch:carfield/safety-island.git,         rev: b0501345b1741fa96b781ef5d845026fec036fd2 } # branch: param_banks
-  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 201453dbcedc8f7235b2723363356ba5845e5120 } # branch: yt/rapidrecovery
+  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 78c7e4b188151c7790bb1422b9aeeb28f5e0b588 } # branch: yt/rapidrecovery
   opentitan:          { git: https://github.com/alsaqr-platform/opentitan.git,          rev: 245d92fe49dc6be32afe3bfb6a133778002d4880 } # branch: carfield
   mailbox_unit:       { git: git@github.com:pulp-platform/mailbox_unit.git,             version: 1.1.0                                }
   apb:                { git: https://github.com/pulp-platform/apb.git,                  version: 0.2.3                                }
diff --git a/bender-common.mk b/bender-common.mk
index e1a1d44a..ac9e5aec 100644
--- a/bender-common.mk
+++ b/bender-common.mk
@@ -11,6 +11,7 @@ common_targs += -t mchan
 common_targs += -t spatz
 common_targs += -t integer_cluster
 common_targs += -t cv32e40p_use_ff_regfile
+common_targs += -t scm_use_fpga_scm
 common_targs += -t cv64a6_imafdcsclic_sv39
 common_targs += -t rtl
 
@@ -18,4 +19,5 @@ common_targs += -t rtl
 common_defs += -D FEATURE_ICACHE_STAT
 common_defs += -D PRIVATE_ICACHE
 common_defs += -D HIERARCHY_ICACHE_32BIT
+common_defs += -D ICAHE_USE_FF
 common_defs += -D CLUSTER_ALIAS