Bump PULP and redundancy cells, remove unneeded parameters override.

pulp-platform · Oct 6, 2023 · 4b498a2 · 4b498a2
1 parent 82b80c0
commit 4b498a2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/Bender.local b/Bender.local
@@ -7,7 +7,7 @@ overrides:
   axi_riscv_atomics:    { git: https://github.com/pulp-platform/axi_riscv_atomics.git     , version: 0.8.1 }
   apb:                  { git: "https://github.com/pulp-platform/apb.git"                 , version: 0.2.3 }
   register_interface:   { git: "https://github.com/pulp-platform/register_interface.git"  , version: 0.4.1 }
-  redundancy_cells:     { git: "https://github.com/pulp-platform/redundancy_cells.git"    , rev: "ecb92ca" } # branch: yt/rapidrecovery
+  redundancy_cells:     { git: "https://github.com/pulp-platform/redundancy_cells.git"    , rev: "f206f5ecbfaa028f9eae6f0efaed9e34631d9171" } # branch: yt/rapidrecovery
   tech_cells_generic:   { git: "https://github.com/pulp-platform/tech_cells_generic.git"  , version: =0.2.13                                }
   riscv-dbg:            { git: "https://github.com/pulp-platform/riscv-dbg.git"           , version: =0.8.0                                 }
   idma:                 { git: "https://github.com/pulp-platform/idma.git"                , version: 0.5.1                                  }

diff --git a/Bender.lock b/Bender.lock
@@ -223,7 +223,7 @@ packages:
     - axi
     - common_verification
   event_unit_flex:
-    revision: 53fb3a1093aaaedfe883739fd8a3155d601210bc
+    revision: 28e0499374117c7b0ef4c6ad81b60d7526af886f
     version: null
     source:
       Git: https://github.com/pulp-platform/event_unit_flex.git
@@ -375,7 +375,7 @@ packages:
     dependencies:
     - axi_slice
   pulp_cluster:
-    revision: 16839e27a7f4a0d96376f89ea97a5e19951e657f
+    revision: 8356888056441d6cf5b94e348a0817264b9b1b8c
     version: null
     source:
       Git: https://github.com/pulp-platform/pulp_cluster.git
@@ -416,7 +416,7 @@ packages:
     - hwpe-stream
     - tech_cells_generic
   redundancy_cells:
-    revision: ecb92caca3f1872360623448397bb9a06d0c2c96
+    revision: f206f5ecbfaa028f9eae6f0efaed9e34631d9171
     version: null
     source:
       Git: https://github.com/pulp-platform/redundancy_cells.git

diff --git a/Bender.yml b/Bender.yml
@@ -16,7 +16,7 @@ dependencies:
   hyperbus:           { git: https://github.com/pulp-platform/hyperbus.git,             version: 0.0.3                                } 
   car_l2:             { git: [email protected]:carfield/carfield_l2_mem.git,       rev: 0143fb296e3614adf8894ff7335cc3f9b92783bd } # branch: main
   safety_island:      { git: [email protected]:carfield/safety-island.git,         rev: 620905a836a10ec1246bc392bb5af1cfdfd32d64 } # branch: michaero/carfield
-  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 16839e27a7f4a0d96376f89ea97a5e19951e657f } # branch: yt/rapidrecovery
+  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 8356888056441d6cf5b94e348a0817264b9b1b8c } # branch: yt/rapidrecovery
   opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 4a88413ebbc1bf09730112d0d2df5e51d5c21314 } # branch: carfield_soc
   mailbox_unit:       { git: [email protected]: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/hw/carfield.sv b/hw/carfield.sv
@@ -1396,8 +1396,6 @@ pulp_cluster #(
   .NB_DMAS                        ( IntClusterNumDmas         ),
   .NB_MPERIPHS                    ( IntClusterNumMstPer       ),
   .NB_SPERIPHS                    ( IntClusterNumSlvPer       ),
-  .CLUSTER_ALIAS                  ( IntClusterAlias           ),
-  .CLUSTER_ALIAS_BASE             ( IntClusterAliasBase       ),
   .SynchStages                    ( SyncStages                ),
   .TCDM_SIZE                      ( IntClusterTcdmSize        ),
   .NB_TCDM_BANKS                  ( IntClusterTcdmBanks       ),

diff --git a/hw/carfield_pkg.sv b/hw/carfield_pkg.sv
@@ -451,8 +451,6 @@ localparam int unsigned IntClusterNumHwpePorts = 9;
 localparam int unsigned IntClusterNumDmas = 4;
 localparam int unsigned IntClusterNumMstPer = 1;
 localparam int unsigned IntClusterNumSlvPer = 10;
-localparam int unsigned IntClusterAlias = 1;
-localparam int unsigned IntClusterAliasBase = 12'h000;
 localparam int unsigned IntClusterTcdmSize = 256*1024;
 localparam int unsigned IntClusterTcdmBanks = 16;
 localparam int unsigned IntClusterHwpePresent = 1;