From 201de222f53b30b53c0dadd619b3c3685cd3f104 Mon Sep 17 00:00:00 2001 From: Yvan Tortorella Date: Thu, 12 Oct 2023 19:32:19 +0200 Subject: [PATCH] Rebased on top of main. --- Bender.local | 2 +- Bender.lock | 4 ++-- Bender.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bender.local b/Bender.local index c46effbe8..140266bd9 100644 --- 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.2 } 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: "257344b589b151844d85d04279a89f65183c7741" } # branch: yt/rapidrecovery + redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git" , rev: "f3b1bc9b2e816fe1b51147ceafa8955326d1b466" } # 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 index fa45209b5..ba7fb53b4 100644 --- a/Bender.lock +++ b/Bender.lock @@ -375,7 +375,7 @@ packages: dependencies: - axi_slice pulp_cluster: - revision: 020860a5d3668e46d9d34709ff6087dc1953b3f1 + revision: 4d1558ac660ad445f62ffe44415ca6efc4240cf6 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: 257344b589b151844d85d04279a89f65183c7741 + revision: f3b1bc9b2e816fe1b51147ceafa8955326d1b466 version: null source: Git: https://github.com/pulp-platform/redundancy_cells.git diff --git a/Bender.yml b/Bender.yml index f7f680adb..2a7701146 100644 --- a/Bender.yml +++ b/Bender.yml @@ -17,8 +17,8 @@ dependencies: car_l2: { git: git@iis-git.ee.ethz.ch:carfield/carfield_l2_mem.git, rev: 0143fb296e3614adf8894ff7335cc3f9b92783bd } # branch: main safety_island: { git: git@iis-git.ee.ethz.ch:carfield/safety-island.git, rev: cc541a6cf5995eea29dd255db68fbe7d2cd10af6 } # branch: michaero/carfield opentitan: { git: https://github.com/pulp-platform/opentitan.git, rev: 2c2830c055198f75fcd193f0e6772f70c2e2b036 } # branch: carfield_soc - pulp_cluster: { git: https://github.com/pulp-platform/pulp_cluster.git, rev: 020860a5d3668e46d9d34709ff6087dc1953b3f1 } # branch: yt/rapidrecovery - opentitan: { git: https://github.com/pulp-platform/opentitan.git, rev: 4946c1ab9dd0f3191a9dea91edd58aa3647a0e80 } # branch: carfield_soc + pulp_cluster: { git: https://github.com/pulp-platform/pulp_cluster.git, rev: 4d1558ac660ad445f62ffe44415ca6efc4240cf6 } # branch: yt/rapidrecovery + opentitan: { git: https://github.com/pulp-platform/opentitan.git, rev: 2c2830c055198f75fcd193f0e6772f70c2e2b036 } # branch: carfield_soc 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 } timer_unit: { git: https://github.com/pulp-platform/timer_unit.git, version: 1.0.2 }