Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treewide: Align cheshire to main branch #107

Merged
merged 1 commit into from
Jul 26, 2023
Merged

treewide: Align cheshire to main branch #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bender.lock
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading