change fifo module names to fifo_v2 to stay compatible with common_cells submodule

This commit is contained in:
Michael Schaffner 2018-08-27 14:44:48 +02:00
parent 4f18e7fca7
commit 38a42055c1
5 changed files with 6 additions and 6 deletions

View file

@ -9,7 +9,7 @@ dependencies:
axi_node: { git: "git@iis-git.ee.ethz.ch:pulp-open/axi_node.git", version: 1.0.3 }
axi_slice: { git: "git@iis-git.ee.ethz.ch:sasa/axi_slice.git", version: 1.1.2 }
tech_cells_generic: { git: "git@iis-git.ee.ethz.ch:pulp-open/tech_cells_generic.git", rev: master }
common_cells: { git: "git@iis-git.ee.ethz.ch:sasa/common_cells.git", version: 1.7.0 }
common_cells: { git: "git@iis-git.ee.ethz.ch:sasa/common_cells.git", version: v1.7.0 }
fpga-support: { git: "https://github.com/pulp-platform/fpga-support.git", version: v0.3.2 }
sources:
- include/riscv_pkg.sv

View file

@ -50,7 +50,7 @@ src := $(filter-out src/ariane_regfile.sv, $(wildcard src/*.sv)) \
src/fpga-support/rtl/SyncSpRamBeNx64.sv \
src/common_cells/src/deprecated/generic_fifo.sv \
src/common_cells/src/deprecated/pulp_sync.sv \
src/common_cells/src/fifo.sv \
src/common_cells/src/fifo_v2.sv \
src/common_cells/src/lzc.sv \
src/common_cells/src/rrarbiter.sv \
tb/ariane_testharness.sv \

@ -1 +1 @@
Subproject commit 62e218d962f0c95a9d4ee645ffafea7307412388
Subproject commit 4277217c9ae8b1228f801e5a67de9ecdce8d887f

View file

@ -446,7 +446,7 @@ module dm_csrs #(
assign progbuf_o = progbuf_q;
assign data_o = data_q;
// response FIFO
fifo #(
fifo_v2 #(
.dtype ( logic [31:0] ),
.DEPTH ( 2 )
) i_fifo (

View file

@ -82,7 +82,7 @@ module lsu_arbiter (
.idx_o ( idx )
);
fifo #(
fifo_v2 #(
.dtype ( fifo_t ),
.DEPTH ( DEPTH )
) i_ld_fifo (
@ -100,7 +100,7 @@ module lsu_arbiter (
.pop_i ( ld_ren )
);
fifo #(
fifo_v2 #(
.dtype ( fifo_t ),
.DEPTH ( DEPTH )
) i_st_fifo (