Skip to content

Vivado 2018.3 Compatibility #7

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Vivado 2018.3 Compatibility #7

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 projects/create_vc709_proj.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ update_compile_order -fileset sources_1

#FIFOs

create_ip -name axis_data_fifo -vendor xilinx.com -library ip -version 1.1 -module_name axis_data_fifo_64_cc -dir $ip_dir/vc709
create_ip -name axis_data_fifo -vendor xilinx.com -library ip -version 2.0 -module_name axis_data_fifo_64_cc -dir $ip_dir/vc709
set_property -dict [list CONFIG.TDATA_NUM_BYTES {8} CONFIG.IS_ACLK_ASYNC {1} CONFIG.HAS_TKEEP {1} CONFIG.HAS_TLAST {1} CONFIG.SYNCHRONIZATION_STAGES {3} CONFIG.Component_Name {axis_data_fifo_64_cc}] [get_ips axis_data_fifo_64_cc]
generate_target {instantiation_template} [get_files $ip_dir/vc709/axis_data_fifo_64_cc/axis_data_fifo_64_cc.xci]
update_compile_order -fileset sources_1
Expand Down
29 changes: 5 additions & 24 deletions rtl/7series/vc709/mem_inf.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,11 @@ axis_data_fifo_64_cc axis_write_data_fifo_mem0 (
.s_axis_tlast(s_axis_mem0_write_tlast), // input wire s_axis_tlast

.m_axis_aclk(c0_ui_clk), // input wire m_axis_aclk
.m_axis_aresetn(c0_aresetn_r), // input wire m_axis_aresetn
.m_axis_tvalid(axis_mem0_cc_to_dm_write_tvalid), // output wire m_axis_tvalid
.m_axis_tready(axis_mem0_cc_to_dm_write_tready), // input wire m_axis_tready
.m_axis_tdata(axis_mem0_cc_to_dm_write_tdata), // output wire [255 : 0] m_axis_tdata
.m_axis_tkeep(axis_mem0_cc_to_dm_write_tkeep), // output wire [31 : 0] m_axis_tkeep
.m_axis_tlast(axis_mem0_cc_to_dm_write_tlast), // output wire m_axis_tlast

.axis_data_count(), // output wire [31 : 0] axis_data_count
.axis_wr_data_count(), // output wire [31 : 0] axis_wr_data_count
.axis_rd_data_count() // output wire [31 : 0] axis_rd_data_count
.m_axis_tlast(axis_mem0_cc_to_dm_write_tlast) // output wire m_axis_tlast
);

axis_data_fifo_64_cc axis_read_data_fifo_mem0 (
Expand All @@ -456,16 +451,11 @@ axis_data_fifo_64_cc axis_read_data_fifo_mem0 (
.s_axis_tlast(axis_mem0_dm_to_cc_read_tlast), // input wire s_axis_tlast

.m_axis_aclk(clk156_25), // input wire m_axis_aclk
.m_axis_aresetn(reset156_25_n), // input wire m_axis_aresetn
.m_axis_tvalid(m_axis_mem0_read_tvalid), // output wire m_axis_tvalid
.m_axis_tready(m_axis_mem0_read_tready), // input wire m_axis_tready
.m_axis_tdata(m_axis_mem0_read_tdata), // output wire [255 : 0] m_axis_tdata
.m_axis_tkeep(m_axis_mem0_read_tkeep), // output wire [31 : 0] m_axis_tkeep
.m_axis_tlast(m_axis_mem0_read_tlast), // output wire m_axis_tlast

.axis_data_count(), // output wire [31 : 0] axis_data_count
.axis_wr_data_count(), // output wire [31 : 0] axis_wr_data_count
.axis_rd_data_count() // output wire [31 : 0] axis_rd_data_count
.m_axis_tlast(m_axis_mem0_read_tlast) // output wire m_axis_tlast
);
end
else begin
Expand Down Expand Up @@ -500,16 +490,11 @@ axis_data_fifo_64_cc axis_write_data_fifo_mem1 (
.s_axis_tlast(s_axis_mem1_write_tlast), // input wire s_axis_tlast

.m_axis_aclk(c1_ui_clk), // input wire m_axis_aclk
.m_axis_aresetn(c1_aresetn_r), // input wire m_axis_aresetn
.m_axis_tvalid(axis_mem1_cc_to_dm_write_tvalid), // output wire m_axis_tvalid
.m_axis_tready(axis_mem1_cc_to_dm_write_tready), // input wire m_axis_tready
.m_axis_tdata(axis_mem1_cc_to_dm_write_tdata), // output wire [255 : 0] m_axis_tdata
.m_axis_tkeep(axis_mem1_cc_to_dm_write_tkeep), // output wire [31 : 0] m_axis_tkeep
.m_axis_tlast(axis_mem1_cc_to_dm_write_tlast), // output wire m_axis_tlast

.axis_data_count(), // output wire [31 : 0] axis_data_count
.axis_wr_data_count(), // output wire [31 : 0] axis_wr_data_count
.axis_rd_data_count() // output wire [31 : 0] axis_rd_data_count
.m_axis_tlast(axis_mem1_cc_to_dm_write_tlast) // output wire m_axis_tlast
);

axis_data_fifo_64_cc axis_read_data_fifo_mem1 (
Expand All @@ -522,16 +507,12 @@ axis_data_fifo_64_cc axis_read_data_fifo_mem1 (
.s_axis_tlast(axis_mem1_dm_to_cc_read_tlast), // input wire s_axis_tlast

.m_axis_aclk(clk156_25), // input wire m_axis_aclk
.m_axis_aresetn(reset156_25_n), // input wire m_axis_aresetn
.m_axis_tvalid(m_axis_mem1_read_tvalid), // output wire m_axis_tvalid
.m_axis_tready(m_axis_mem1_read_tready), // input wire m_axis_tready
.m_axis_tdata(m_axis_mem1_read_tdata), // output wire [255 : 0] m_axis_tdata
.m_axis_tkeep(m_axis_mem1_read_tkeep), // output wire [31 : 0] m_axis_tkeep
.m_axis_tlast(m_axis_mem1_read_tlast), // output wire m_axis_tlast

.axis_data_count(), // output wire [31 : 0] axis_data_count
.axis_wr_data_count(), // output wire [31 : 0] axis_wr_data_count
.axis_rd_data_count() // output wire [31 : 0] axis_rd_data_count
.m_axis_tlast(m_axis_mem1_read_tlast) // output wire m_axis_tlast

);
end
else begin
Expand Down