Skip to content

Commit

Permalink
Merge pull request #107 from pulp-platform/aottaviano/bump-cheshire
Browse files Browse the repository at this point in the history
treewide: Align cheshire to main branch
  • Loading branch information
alex96295 authored Jul 26, 2023
2 parents fe78fb2 + 11a88f4 commit 4dcbd4a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ packages:
- register_interface
- tech_cells_generic
cheshire:
revision: 31f30657937b3a50b761298289be68e613182d54
revision: ce5e6b607632fa0c8c03a728783f085fc898a644
version: null
source:
Git: https://github.com/pulp-platform/cheshire.git
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package:
dependencies:
register_interface: { git: https://github.com/pulp-platform/register_interface.git, version: 0.4.1 }
axi: { git: https://github.com/pulp-platform/axi.git, version: 0.39.0-beta.10 }
cheshire: { git: https://github.com/pulp-platform/cheshire.git, rev: 31f30657937b3a50b761298289be68e613182d54 } # branch: michaero/carfield
cheshire: { git: https://github.com/pulp-platform/cheshire.git, rev: ce5e6b607632fa0c8c03a728783f085fc898a644 } # branch: aottaviano/carfield
hyperbus: { git: https://github.com/pulp-platform/hyperbus.git, rev: 2adb7271438cdb96c19fbaf3e2a6bf89ffeee568 } # branch: lv/phys_in_use
car_l2: { git: [email protected]:carfield/carfield_l2_mem.git, rev: d6ab486b2777bf78c38b49352b5977565a272a58 } # branch: main
safety_island: { git: [email protected]:carfield/safety-island.git, rev: 382bc52d437c578cb68e4f5dcd1db291b3325001 } # branch: param_banks
Expand Down
4 changes: 2 additions & 2 deletions tb/carfield_fix.sv
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ module carfield_soc_fixture;
.axi_llc_mst_req ( '0 ),
.axi_llc_mst_rsp ( ),
// External AXI port
.axi_ext_mst_req ( axi_muxed_req ),
.axi_ext_mst_rsp ( axi_muxed_rsp ),
.axi_slink_mst_req ( axi_muxed_req ),
.axi_slink_mst_rsp ( axi_muxed_rsp ),
.*
);

Expand Down

0 comments on commit 4dcbd4a

Please sign in to comment.