zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmcomms2/zc706pr: Update the fifo interface of the PR module

main
Istvan Csomortani 2015-10-13 11:37:44 +03:00
parent c9a5057b93
commit 21737ad7b8
4 changed files with 521 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
projects/fmcomms2/common/prcfg.v
View File

@ -50,27 +50,59 @@ module prcfg (
// tx side // tx side
dma_dac_en, dma_dac_i0_enable,
dma_dac_dvalid, dma_dac_i0_data,
dma_dac_ddata, dma_dac_i0_valid,
dma_dac_dunf, dma_dac_q0_enable,
dma_dac_q0_data,
dma_dac_q0_valid,
dma_dac_i1_enable,
dma_dac_i1_data,
dma_dac_i1_valid,
dma_dac_q1_enable,
dma_dac_q1_data,
dma_dac_q1_valid,
core_dac_en, core_dac_i0_enable,
core_dac_dvalid, core_dac_i0_data,
core_dac_ddata, core_dac_i0_valid,
core_dac_dunf, core_dac_q0_enable,
core_dac_q0_data,
core_dac_q0_valid,
core_dac_i1_enable,
core_dac_i1_data,
core_dac_i1_valid,
core_dac_q1_enable,
core_dac_q1_data,
core_dac_q1_valid,
// rx side // rx side
core_adc_dwr, dma_adc_i0_enable,
core_adc_dsync, dma_adc_i0_data,
core_adc_ddata, dma_adc_i0_valid,
core_adc_ovf, dma_adc_q0_enable,
dma_adc_q0_data,
dma_adc_q0_valid,
dma_adc_i1_enable,
dma_adc_i1_data,
dma_adc_i1_valid,
dma_adc_q1_enable,
dma_adc_q1_data,
dma_adc_q1_valid,
dma_adc_dwr, core_adc_i0_enable,
dma_adc_dsync, core_adc_i0_data,
dma_adc_ddata, core_adc_i0_valid,
dma_adc_ovf); core_adc_q0_enable,
core_adc_q0_data,
core_adc_q0_valid,
core_adc_i1_enable,
core_adc_i1_data,
core_adc_i1_valid,
core_adc_q1_enable,
core_adc_q1_data,
core_adc_q1_valid);
input clk; input clk;
@ -83,31 +115,63 @@ module prcfg (
// tx side // tx side
output dma_dac_en; input dma_dac_i0_enable;
input dma_dac_dvalid; output [15:0] dma_dac_i0_data;
input [63:0] dma_dac_ddata; input dma_dac_i0_valid;
input dma_dac_dunf; input dma_dac_q0_enable;
output [15:0] dma_dac_q0_data;
input dma_dac_q0_valid;
input dma_dac_i1_enable;
output [15:0] dma_dac_i1_data;
input dma_dac_i1_valid;
input dma_dac_q1_enable;
output [15:0] dma_dac_q1_data;
input dma_dac_q1_valid;
input core_dac_en; output core_dac_i0_enable;
output core_dac_dvalid; input [15:0] core_dac_i0_data;
output [63:0] core_dac_ddata; output core_dac_i0_valid;
output core_dac_dunf; output core_dac_q0_enable;
input [15:0] core_dac_q0_data;
output core_dac_q0_valid;
output core_dac_i1_enable;
input [15:0] core_dac_i1_data;
output core_dac_i1_valid;
output core_dac_q1_enable;
input [15:0] core_dac_q1_data;
output core_dac_q1_valid;
// rx side // rx side
input core_adc_dwr; input dma_adc_i0_enable;
input core_adc_dsync; input [15:0] dma_adc_i0_data;
input [63:0] core_adc_ddata; input dma_adc_i0_valid;
output core_adc_ovf; input dma_adc_q0_enable;
input [15:0] dma_adc_q0_data;
input dma_adc_q0_valid;
input dma_adc_i1_enable;
input [15:0] dma_adc_i1_data;
input dma_adc_i1_valid;
input dma_adc_q1_enable;
input [15:0] dma_adc_q1_data;
input dma_adc_q1_valid;
output dma_adc_dwr; output core_adc_i0_enable;
output dma_adc_dsync; output [15:0] core_adc_i0_data;
output [63:0] dma_adc_ddata; output core_adc_i0_valid;
input dma_adc_ovf; output core_adc_q0_enable;
output [15:0] core_adc_q0_data;
output core_adc_q0_valid;
output core_adc_i1_enable;
output [15:0] core_adc_i1_data;
output core_adc_i1_valid;
output core_adc_q1_enable;
output [15:0] core_adc_q1_data;
output core_adc_q1_valid;
// fmcomms2 configuration // fmcomms2 configuration
localparam NUM_OF_CHANNELS = 2; localparam NUM_OF_CHANNELS = 4;
localparam ADC_ENABLE = 1; localparam ADC_ENABLE = 1;
localparam DAC_ENABLE = 1; localparam DAC_ENABLE = 1;
@ -119,26 +183,58 @@ module prcfg (
.DAC_EN (DAC_ENABLE)) .DAC_EN (DAC_ENABLE))
i_prcfg_top ( i_prcfg_top (
.clk (clk), .clk (clk),
.adc_gpio_input (adc_gpio_input),
.adc_gpio_output (adc_gpio_output),
.dac_gpio_input (dac_gpio_input), .dac_gpio_input (dac_gpio_input),
.dac_gpio_output (dac_gpio_output), .dac_gpio_output (dac_gpio_output),
.dma_dac_en (dma_dac_en), .adc_gpio_input (adc_gpio_input),
.dma_dac_dunf (dma_dac_dunf), .adc_gpio_output (adc_gpio_output),
.dma_dac_ddata (dma_dac_ddata), .dma_dac_0_enable (dma_dac_i0_enable),
.dma_dac_dvalid (dma_dac_dvalid), .dma_dac_0_data (dma_dac_i0_data),
.core_dac_en (core_dac_en), .dma_dac_0_valid (dma_dac_i0_valid),
.core_dac_dunf (core_dac_dunf), .dma_dac_1_enable (dma_dac_q0_enable),
.core_dac_ddata (core_dac_ddata), .dma_dac_1_data (dma_dac_q0_data),
.core_dac_dvalid (core_dac_dvalid), .dma_dac_1_valid (dma_dac_q0_valid),
.core_adc_dwr (core_adc_dwr), .dma_dac_2_enable (dma_dac_i1_enable),
.core_adc_dsync (core_adc_dsync), .dma_dac_2_data (dma_dac_i1_data),
.core_adc_ddata (core_adc_ddata), .dma_dac_2_valid (dma_dac_i1_valid),
.core_adc_ovf (core_adc_ovf), .dma_dac_3_enable (dma_dac_q1_enable),
.dma_adc_dwr (dma_adc_dwr), .dma_dac_3_data (dma_dac_q1_data),
.dma_adc_dsync (dma_adc_dsync), .dma_dac_3_valid (dma_dac_q1_valid),
.dma_adc_ddata (dma_adc_ddata), .core_dac_0_enable (core_dac_i0_enable),
.dma_adc_ovf (dma_adc_ovf)); .core_dac_0_data (core_dac_i0_data),
.core_dac_0_valid (core_dac_i0_valid),
.core_dac_1_enable (core_dac_q0_enable),
.core_dac_1_data (core_dac_q0_data),
.core_dac_1_valid (core_dac_q0_valid),
.core_dac_2_enable (core_dac_i1_enable),
.core_dac_2_data (core_dac_i1_data),
.core_dac_2_valid (core_dac_i1_valid),
.core_dac_3_enable (core_dac_q1_enable),
.core_dac_3_data (core_dac_q1_data),
.core_dac_3_valid (core_dac_q1_valid),
.dma_adc_0_enable (dma_adc_i0_enable),
.dma_adc_0_data (dma_adc_i0_data),
.dma_adc_0_valid (dma_adc_i0_valid),
.dma_adc_1_enable (dma_adc_q0_enable),
.dma_adc_1_data (dma_adc_q0_data),
.dma_adc_1_valid (dma_adc_q0_valid),
.dma_adc_2_enable (dma_adc_i1_enable),
.dma_adc_2_data (dma_adc_i1_data),
.dma_adc_2_valid (dma_adc_i1_valid),
.dma_adc_3_enable (dma_adc_q1_enable),
.dma_adc_3_data (dma_adc_q1_data),
.dma_adc_3_valid (dma_adc_q1_valid),
.core_adc_0_enable (core_adc_i0_enable),
.core_adc_0_data (core_adc_i0_data),
.core_adc_0_valid (core_adc_i0_valid),
.core_adc_1_enable (core_adc_q0_enable),
.core_adc_1_data (core_adc_q0_data),
.core_adc_1_valid (core_adc_q0_valid),
.core_adc_2_enable (core_adc_i1_enable),
.core_adc_2_data (core_adc_i1_data),
.core_adc_2_valid (core_adc_i1_valid),
.core_adc_3_enable (core_adc_q1_enable),
.core_adc_3_data (core_adc_q1_data),
.core_adc_3_valid (core_adc_q1_valid));
endmodule endmodule

292
projects/fmcomms2/common/prcfg_bd.tcl
View File

@ -2,22 +2,56 @@
# prcfg io # prcfg io
create_bd_port -dir O clk create_bd_port -dir O clk
create_bd_port -dir I dma_dac_en
create_bd_port -dir O dma_dac_dvalid create_bd_port -dir I dma_dac_i0_enable
create_bd_port -dir O -from 63 -to 0 dma_dac_ddata create_bd_port -dir O dma_dac_i0_data
create_bd_port -dir O dma_dac_dunf create_bd_port -dir I dma_dac_i0_valid
create_bd_port -dir O core_dac_en create_bd_port -dir I dma_dac_q0_enable
create_bd_port -dir I core_dac_dvalid create_bd_port -dir O dma_dac_q0_data
create_bd_port -dir I -from 63 -to 0 core_dac_ddata create_bd_port -dir I dma_dac_q0_valid
create_bd_port -dir I core_dac_dunf create_bd_port -dir I dma_dac_i1_enable
create_bd_port -dir O core_adc_dwr create_bd_port -dir O dma_dac_i1_data
create_bd_port -dir O core_adc_dsync create_bd_port -dir I dma_dac_i1_valid
create_bd_port -dir O -from 63 -to 0 core_adc_ddata create_bd_port -dir I dma_dac_q1_enable
create_bd_port -dir I core_adc_ovf create_bd_port -dir O dma_dac_q1_data
create_bd_port -dir I dma_adc_dwr create_bd_port -dir I dma_dac_q1_valid
create_bd_port -dir I dma_adc_dsync create_bd_port -dir O core_dac_i0_enable
create_bd_port -dir I -from 63 -to 0 dma_adc_ddata create_bd_port -dir I core_dac_i0_data
create_bd_port -dir O dma_adc_ovf create_bd_port -dir O core_dac_i0_valid
create_bd_port -dir O core_dac_q0_enable
create_bd_port -dir I core_dac_q0_data
create_bd_port -dir O core_dac_q0_valid
create_bd_port -dir O core_dac_i1_enable
create_bd_port -dir I core_dac_i1_data
create_bd_port -dir O core_dac_i1_valid
create_bd_port -dir O core_dac_q1_enable
create_bd_port -dir I core_dac_q1_data
create_bd_port -dir O core_dac_q1_valid
create_bd_port -dir I dma_adc_i0_enable
create_bd_port -dir I dma_adc_i0_data
create_bd_port -dir I dma_adc_i0_valid
create_bd_port -dir I dma_adc_q0_enable
create_bd_port -dir I dma_adc_q0_data
create_bd_port -dir I dma_adc_q0_valid
create_bd_port -dir I dma_adc_i1_enable
create_bd_port -dir I dma_adc_i1_data
create_bd_port -dir I dma_adc_i1_valid
create_bd_port -dir I dma_adc_q1_enable
create_bd_port -dir I dma_adc_q1_data
create_bd_port -dir I dma_adc_q1_valid
create_bd_port -dir O core_adc_i0_enable
create_bd_port -dir O core_adc_i0_data
create_bd_port -dir O core_adc_i0_valid
create_bd_port -dir O core_adc_q0_enable
create_bd_port -dir O core_adc_q0_data
create_bd_port -dir O core_adc_q0_valid
create_bd_port -dir O core_adc_i1_enable
create_bd_port -dir O core_adc_i1_data
create_bd_port -dir O core_adc_i1_valid
create_bd_port -dir O core_adc_q1_enable
create_bd_port -dir O core_adc_q1_data
create_bd_port -dir O core_adc_q1_valid
create_bd_port -dir I -from 31 -to 0 up_dac_gpio_in create_bd_port -dir I -from 31 -to 0 up_dac_gpio_in
create_bd_port -dir I -from 31 -to 0 up_adc_gpio_in create_bd_port -dir I -from 31 -to 0 up_adc_gpio_in
create_bd_port -dir O -from 31 -to 0 up_dac_gpio_out create_bd_port -dir O -from 31 -to 0 up_dac_gpio_out
@ -25,82 +59,182 @@ create_bd_port -dir O -from 31 -to 0 up_adc_gpio_out
# re-wiring # re-wiring
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_dac_dma/fifo_rd_en]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_enable_0]] [get_bd_pins util_ad9361_dac_upack/dac_enable_0]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_dac_dma/fifo_rd_valid]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_valid_0]] [get_bd_pins util_ad9361_dac_upack/dac_valid_0]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_dac_dma/fifo_rd_dout]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_data_0]] [get_bd_pins util_ad9361_dac_upack/dac_data_0]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_dac_dma/fifo_rd_underflow]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_enable_1]] [get_bd_pins util_ad9361_dac_upack/dac_enable_1]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_adc_dma/fifo_wr_en]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_valid_1]] [get_bd_pins util_ad9361_dac_upack/dac_valid_1]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_adc_dma/fifo_wr_sync]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_data_1]] [get_bd_pins util_ad9361_dac_upack/dac_data_1]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_adc_dma/fifo_wr_din]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_enable_2]] [get_bd_pins util_ad9361_dac_upack/dac_enable_2]
delete_bd_objs [get_bd_nets -of_objects [get_bd_pins axi_ad9361_adc_dma/fifo_wr_overflow]] disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_valid_2]] [get_bd_pins util_ad9361_dac_upack/dac_valid_2]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_data_2]] [get_bd_pins util_ad9361_dac_upack/dac_data_2]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_enable_3]] [get_bd_pins util_ad9361_dac_upack/dac_enable_3]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_valid_3]] [get_bd_pins util_ad9361_dac_upack/dac_valid_3]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_dac_upack/dac_data_3]] [get_bd_pins util_ad9361_dac_upack/dac_data_3]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_enable_0]] [get_bd_pins util_ad9361_adc_pack/adc_enable_0]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_valid_0]] [get_bd_pins util_ad9361_adc_pack/adc_valid_0]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_data_0]] [get_bd_pins util_ad9361_adc_pack/adc_data_0]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_enable_1]] [get_bd_pins util_ad9361_adc_pack/adc_enable_1]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_valid_1]] [get_bd_pins util_ad9361_adc_pack/adc_valid_1]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_data_1]] [get_bd_pins util_ad9361_adc_pack/adc_data_1]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_enable_2]] [get_bd_pins util_ad9361_adc_pack/adc_enable_2]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_valid_2]] [get_bd_pins util_ad9361_adc_pack/adc_valid_2]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_data_2]] [get_bd_pins util_ad9361_adc_pack/adc_data_2]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_enable_3]] [get_bd_pins util_ad9361_adc_pack/adc_enable_3]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_valid_3]] [get_bd_pins util_ad9361_adc_pack/adc_valid_3]
disconnect_bd_net [get_bd_nets -of_objects [get_bd_pins util_ad9361_adc_pack/adc_data_3]] [get_bd_pins util_ad9361_adc_pack/adc_data_3]
ad_connect clk axi_ad9361/clk ad_connect clk axi_ad9361/clk
ad_connect dma_dac_en axi_ad9361_dac_dma/fifo_rd_en # tx data path
ad_connect dma_dac_dvalid axi_ad9361_dac_dma/fifo_rd_valid ad_connect dma_dac_i0_enable util_ad9361_dac_upack/dac_enable_0
ad_connect dma_dac_ddata axi_ad9361_dac_dma/fifo_rd_dout ad_connect dma_dac_i0_data util_ad9361_dac_upack/dac_data_0
ad_connect dma_dac_dunf axi_ad9361_dac_dma/fifo_rd_underflow ad_connect dma_dac_i0_valid util_ad9361_dac_upack/dac_valid_0
ad_connect core_dac_en util_dac_unpack/dma_rd ad_connect dma_dac_q0_enable util_ad9361_dac_upack/dac_enable_1
ad_connect core_dac_dvalid util_dac_unpack/fifo_valid ad_connect dma_dac_q0_data util_ad9361_dac_upack/dac_data_1
ad_connect core_dac_ddata util_dac_unpack/dma_data ad_connect dma_dac_q0_valid util_ad9361_dac_upack/dac_valid_1
ad_connect core_dac_dunf axi_ad9361/dac_dunf ad_connect dma_dac_i1_enable util_ad9361_dac_upack/dac_enable_2
ad_connect up_dac_gpio_in axi_ad9361/up_dac_gpio_in ad_connect dma_dac_i1_data util_ad9361_dac_upack/dac_data_2
ad_connect up_dac_gpio_out axi_ad9361/up_dac_gpio_out ad_connect dma_dac_i1_valid util_ad9361_dac_upack/dac_valid_2
ad_connect dma_dac_q1_enable util_ad9361_dac_upack/dac_enable_3
ad_connect dma_dac_q1_data util_ad9361_dac_upack/dac_data_3
ad_connect dma_dac_q1_valid util_ad9361_dac_upack/dac_valid_3
ad_connect dma_adc_dwr axi_ad9361_adc_dma/fifo_wr_en ad_connect core_dac_i0_enable axi_ad9361/dac_enable_i0
ad_connect dma_adc_dsync axi_ad9361_adc_dma/fifo_wr_sync ad_connect core_dac_i0_data axi_ad9361/dac_data_i0
ad_connect dma_adc_ddata axi_ad9361_adc_dma/fifo_wr_din ad_connect core_dac_i0_valid axi_ad9361/dac_valid_i0
ad_connect dma_adc_ovf axi_ad9361_adc_dma/fifo_wr_overflow ad_connect core_dac_q0_enable axi_ad9361/dac_enable_q0
ad_connect core_adc_dwr util_adc_pack/dvalid ad_connect core_dac_q0_data axi_ad9361/dac_data_q0
ad_connect core_adc_dsync util_adc_pack/dsync ad_connect core_dac_q0_valid axi_ad9361/dac_valid_q0
ad_connect core_adc_ddata util_adc_pack/ddata ad_connect core_dac_i1_enable axi_ad9361/dac_enable_i1
ad_connect core_adc_ovf axi_ad9361/adc_dovf ad_connect core_dac_i1_data axi_ad9361/dac_data_i1
ad_connect core_dac_i1_valid axi_ad9361/dac_valid_i1
ad_connect core_dac_q1_enable axi_ad9361/dac_enable_q1
ad_connect core_dac_q1_data axi_ad9361/dac_data_q1
ad_connect core_dac_q1_valid axi_ad9361/dac_valid_q1
# rx data path
ad_connect dma_adc_i0_enable util_ad9361_adc_pack/adc_enable_0
ad_connect dma_adc_i0_data util_ad9361_adc_pack/adc_data_0
ad_connect dma_adc_i0_valid util_ad9361_adc_pack/adc_valid_0
ad_connect dma_adc_q0_enable util_ad9361_adc_pack/adc_enable_1
ad_connect dma_adc_q0_data util_ad9361_adc_pack/adc_data_1
ad_connect dma_adc_q0_valid util_ad9361_adc_pack/adc_valid_1
ad_connect dma_adc_i1_enable util_ad9361_adc_pack/adc_enable_2
ad_connect dma_adc_i1_data util_ad9361_adc_pack/adc_data_2
ad_connect dma_adc_i1_valid util_ad9361_adc_pack/adc_valid_2
ad_connect dma_adc_q1_enable util_ad9361_adc_pack/adc_enable_3
ad_connect dma_adc_q1_data util_ad9361_adc_pack/adc_data_3
ad_connect dma_adc_q1_valid util_ad9361_adc_pack/adc_valid_3
ad_connect core_adc_i0_enable util_ad9361_adc_fifo/dout_enable_0
ad_connect core_adc_i0_data util_ad9361_adc_fifo/dout_data_0
ad_connect core_adc_i0_valid util_ad9361_adc_fifo/dout_valid_0
ad_connect core_adc_q0_enable util_ad9361_adc_fifo/dout_enable_1
ad_connect core_adc_q0_data util_ad9361_adc_fifo/dout_data_1
ad_connect core_adc_q0_valid util_ad9361_adc_fifo/dout_valid_1
ad_connect core_adc_i1_enable util_ad9361_adc_fifo/dout_enable_2
ad_connect core_adc_i1_data util_ad9361_adc_fifo/dout_data_2
ad_connect core_adc_i1_valid util_ad9361_adc_fifo/dout_valid_2
ad_connect core_adc_q1_enable util_ad9361_adc_fifo/dout_enable_3
ad_connect core_adc_q1_data util_ad9361_adc_fifo/dout_data_3
ad_connect core_adc_q1_valid util_ad9361_adc_fifo/dout_valid_3
ad_connect up_dac_gpio_in axi_ad9361/up_dac_gpio_in
ad_connect up_adc_gpio_in axi_ad9361/up_adc_gpio_in ad_connect up_adc_gpio_in axi_ad9361/up_adc_gpio_in
ad_connect up_dac_gpio_out axi_ad9361/up_dac_gpio_out
ad_connect up_adc_gpio_out axi_ad9361/up_adc_gpio_out ad_connect up_adc_gpio_out axi_ad9361/up_adc_gpio_out
# monitoring # rx side monitoring
set ila_adc_core [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.0 ila_adc_core] set ila_rx_0 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_rx_0]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_adc_core set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_rx_0
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_adc_core set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_rx_0
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_adc_core set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_rx_0
set_property -dict [list CONFIG.C_PROBE1_WIDTH {64}] $ila_adc_core set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_rx_0
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_adc_core set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_rx_0
ad_connect clk ila_adc_core/clk ad_connect sys_cpu_clk ila_rx_0/clk
ad_connect util_adc_pack/dvalid ila_adc_core/probe0 ad_connect util_ad9361_adc_pack/adc_valid_0 ila_rx_0/probe0
ad_connect util_adc_pack/ddata ila_adc_core/probe1 ad_connect util_ad9361_adc_pack/adc_data_0 ila_rx_0/probe1
set ila_dac_core [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.0 ila_dac_core] set ila_rx_1 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_rx_1]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_dac_core set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_rx_1
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_dac_core set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_rx_1
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_dac_core set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_rx_1
set_property -dict [list CONFIG.C_PROBE1_WIDTH {64}] $ila_dac_core set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_rx_1
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_dac_core set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_rx_1
ad_connect clk ila_dac_core/clk ad_connect sys_cpu_clk ila_rx_1/clk
ad_connect util_dac_unpack/fifo_valid ila_dac_core/probe0 ad_connect util_ad9361_adc_pack/adc_valid_0 ila_rx_1/probe0
ad_connect util_dac_unpack/dma_data ila_dac_core/probe1 ad_connect util_ad9361_adc_pack/adc_data_0 ila_rx_1/probe1
set ila_adc_dma [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.0 ila_adc_dma] set ila_rx_2 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_rx_2]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_adc_dma set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_rx_2
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_adc_dma set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_rx_2
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_adc_dma set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_rx_2
set_property -dict [list CONFIG.C_PROBE1_WIDTH {64}] $ila_adc_dma set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_rx_2
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_adc_dma set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_rx_2
ad_connect clk ila_adc_dma/clk ad_connect sys_cpu_clk ila_rx_2/clk
ad_connect axi_ad9361_adc_dma/fifo_wr_en ila_adc_dma/probe0 ad_connect util_ad9361_adc_pack/adc_valid_0 ila_rx_2/probe0
ad_connect axi_ad9361_adc_dma/fifo_wr_din ila_adc_dma/probe1 ad_connect util_ad9361_adc_pack/adc_data_0 ila_rx_2/probe1
set ila_dac_dma [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.0 ila_dac_dma] set ila_rx_3 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_rx_3]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_dac_dma set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_rx_3
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_dac_dma set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_rx_3
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_dac_dma set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_rx_3
set_property -dict [list CONFIG.C_PROBE1_WIDTH {64}] $ila_dac_dma set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_rx_3
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_dac_dma set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_rx_3
ad_connect clk ila_dac_dma/clk ad_connect sys_cpu_clk ila_rx_3/clk
ad_connect axi_ad9361_dac_dma/fifo_rd_en ila_dac_dma/probe0 ad_connect util_ad9361_adc_pack/adc_valid_0 ila_rx_3/probe0
ad_connect axi_ad9361_dac_dma/fifo_rd_dout ila_dac_dma/probe1 ad_connect util_ad9361_adc_pack/adc_data_0 ila_rx_3/probe1
# rx side monitoring
set ila_tx_0 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_tx_0]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_tx_0
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_tx_0
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_tx_0
set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_tx_0
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_tx_0
ad_connect axi_ad9361/l_clk ila_tx_0/clk
ad_connect util_ad9361_adc_fifo/dout_valid_0 ila_tx_0/probe0
ad_connect util_ad9361_adc_fifo/dout_data_0 ila_tx_0/probe1
set ila_tx_1 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_tx_1]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_tx_1
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_tx_1
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_tx_1
set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_tx_1
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_tx_1
ad_connect axi_ad9361/l_clk ila_tx_1/clk
ad_connect util_ad9361_adc_fifo/dout_valid_1 ila_tx_1/probe0
ad_connect util_ad9361_adc_fifo/dout_data_1 ila_tx_1/probe1
set ila_tx_2 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_tx_2]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_tx_2
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_tx_2
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_tx_2
set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_tx_2
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_tx_2
ad_connect axi_ad9361/l_clk ila_tx_2/clk
ad_connect util_ad9361_adc_fifo/dout_valid_2 ila_tx_2/probe0
ad_connect util_ad9361_adc_fifo/dout_data_2 ila_tx_2/probe1
set ila_tx_3 [create_bd_cell -type ip -vlnv xilinx.com:ip:ila:5.1 ila_tx_3]
set_property -dict [list CONFIG.C_MONITOR_TYPE {Native}] $ila_tx_3
set_property -dict [list CONFIG.C_NUM_OF_PROBES {2}] $ila_tx_3
set_property -dict [list CONFIG.C_PROBE0_WIDTH {1}] $ila_tx_3
set_property -dict [list CONFIG.C_PROBE1_WIDTH {16}] $ila_tx_3
set_property -dict [list CONFIG.C_EN_STRG_QUAL {1}] $ila_tx_3
ad_connect axi_ad9361/l_clk ila_tx_3/clk
ad_connect util_ad9361_adc_fifo/dout_valid_3 ila_tx_3/probe0
ad_connect util_ad9361_adc_fifo/dout_data_3 ila_tx_3/probe1

2
projects/fmcomms2/zc706pr/system_project.tcl
View File

@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/scripts/adi_board.tcl
adi_project_create fmcomms2_zc706 1 adi_project_create fmcomms2_zc706 1
adi_project_synth fmcomms2_zc706 "" \ adi_project_synth fmcomms2_zc706 "" \
[list "system_top.v" \ [list "system_top.v" \
"$ad_hdl_dir/library/prcfg/common/prcfg_bb.v" \ "../common/prcfg_bb.v" \
"$ad_hdl_dir/library/common/ad_iobuf.v"] \ "$ad_hdl_dir/library/common/ad_iobuf.v"] \
[list "../zc706/system_constr.xdc" \ [list "../zc706/system_constr.xdc" \
"$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc"] "$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc"]

202
projects/fmcomms2/zc706pr/system_top.v
View File

@ -170,23 +170,55 @@ module system_top (
wire [63:0] gpio_t; wire [63:0] gpio_t;
wire clk; wire clk;
wire dma_dac_dunf; wire dma_dac_i0_enable;
wire core_dac_dunf; wire [15:0] dma_dac_i0_data;
wire [63:0] dma_dac_ddata; wire dma_dac_i0_valid;
wire [63:0] core_dac_ddata; wire dma_dac_q0_enable;
wire dma_dac_en; wire [15:0] dma_dac_q0_data;
wire core_dac_en; wire dma_dac_q0_valid;
wire dma_dac_dvalid; wire dma_dac_i1_enable;
wire core_dac_dvalid; wire [15:0] dma_dac_i1_data;
wire dma_dac_i1_valid;
wire dma_dac_q1_enable;
wire [15:0] dma_dac_q1_data;
wire dma_dac_q1_valid;
wire core_dac_i0_enable;
wire [15:0] core_dac_i0_data;
wire core_dac_i0_valid;
wire core_dac_q0_enable;
wire [15:0] core_dac_q0_data;
wire core_dac_q0_valid;
wire core_dac_i1_enable;
wire [15:0] core_dac_i1_data;
wire core_dac_i1_valid;
wire core_dac_q1_enable;
wire [15:0] core_dac_q1_data;
wire core_dac_q1_valid;
wire dma_adc_i0_enable;
wire [15:0] dma_adc_i0_data;
wire dma_adc_i0_valid;
wire dma_adc_q0_enable;
wire [15:0] dma_adc_q0_data;
wire dma_adc_q0_valid;
wire dma_adc_i1_enable;
wire [15:0] dma_adc_i1_data;
wire dma_adc_i1_valid;
wire dma_adc_q1_enable;
wire [15:0] dma_adc_q1_data;
wire dma_adc_q1_valid;
wire core_adc_i0_enable;
wire [15:0] core_adc_i0_data;
wire core_adc_i0_valid;
wire core_adc_q0_enable;
wire [15:0] core_adc_q0_data;
wire core_adc_q0_valid;
wire core_adc_i1_enable;
wire [15:0] core_adc_i1_data;
wire core_adc_i1_valid;
wire core_adc_q1_enable;
wire [15:0] core_adc_q1_data;
wire core_adc_q1_valid;
wire dma_adc_ovf;
wire core_adc_ovf;
wire [63:0] dma_adc_ddata;
wire [63:0] core_adc_ddata;
wire dma_adc_dwr;
wire core_adc_dwr;
wire dma_adc_dsync;
wire core_adc_dsync;
wire [31:0] adc_gpio_input; wire [31:0] adc_gpio_input;
wire [31:0] adc_gpio_output; wire [31:0] adc_gpio_output;
wire [31:0] dac_gpio_input; wire [31:0] dac_gpio_input;
@ -228,22 +260,55 @@ module system_top (
.adc_gpio_output (adc_gpio_output), .adc_gpio_output (adc_gpio_output),
.dac_gpio_input (dac_gpio_input), .dac_gpio_input (dac_gpio_input),
.dac_gpio_output (dac_gpio_output), .dac_gpio_output (dac_gpio_output),
.dma_dac_en(dma_dac_en), .dma_dac_i0_enable (dma_dac_i0_enable),
.dma_dac_dunf(dma_dac_dunf), .dma_dac_i0_data (dma_dac_i0_data),
.dma_dac_ddata(dma_dac_ddata), .dma_dac_i0_valid (dma_dac_i0_valid),
.dma_dac_dvalid(dma_dac_dvalid), .dma_dac_q0_enable (dma_dac_q0_enable),
.core_dac_en(core_dac_en), .dma_dac_q0_data (dma_dac_q0_data),
.core_dac_dunf(core_dac_dunf), .dma_dac_q0_valid (dma_dac_q0_valid),
.core_dac_ddata(core_dac_ddata), .dma_dac_i1_enable (dma_dac_i1_enable),
.core_dac_dvalid(core_dac_dvalid), .dma_dac_i1_data (dma_dac_i1_data),
.core_adc_dwr(core_adc_dwr), .dma_dac_i1_valid (dma_dac_i1_valid),
.core_adc_dsync(core_adc_dsync), .dma_dac_q1_enable (dma_dac_q1_enable),
.core_adc_ddata(core_adc_ddata), .dma_dac_q1_data (dma_dac_q1_data),
.core_adc_ovf(core_adc_ovf), .dma_dac_q1_valid (dma_dac_q1_valid),
.dma_adc_dwr(dma_adc_dwr), .core_dac_i0_enable (core_dac_i0_enable),
.dma_adc_dsync(dma_adc_dsync), .core_dac_i0_data (core_dac_i0_data),
.dma_adc_ddata(dma_adc_ddata), .core_dac_i0_valid (core_dac_i0_valid),
.dma_adc_ovf(dma_adc_ovf)); .core_dac_q0_enable (core_dac_q0_enable),
.core_dac_q0_data (core_dac_q0_data),
.core_dac_q0_valid (core_dac_q0_valid),
.core_dac_i1_enable (core_dac_i1_enable),
.core_dac_i1_data (core_dac_i1_data),
.core_dac_i1_valid (core_dac_i1_valid),
.core_dac_q1_enable (core_dac_q1_enable),
.core_dac_q1_data (core_dac_q1_data),
.core_dac_q1_valid (core_dac_q1_valid),
.dma_adc_i0_enable (dma_adc_i0_enable),
.dma_adc_i0_data (dma_adc_i0_data),
.dma_adc_i0_valid (dma_adc_i0_valid),
.dma_adc_q0_enable (dma_adc_q0_enable),
.dma_adc_q0_data (dma_adc_q0_data),
.dma_adc_q0_valid (dma_adc_q0_valid),
.dma_adc_i1_enable (dma_adc_i1_enable),
.dma_adc_i1_data (dma_adc_i1_data),
.dma_adc_i1_valid (dma_adc_i1_valid),
.dma_adc_q1_enable (dma_adc_q1_enable),
.dma_adc_q1_data (dma_adc_q1_data),
.dma_adc_q1_valid (dma_adc_q1_valid),
.core_adc_i0_enable (core_adc_i0_enable),
.core_adc_i0_data (core_adc_i0_data),
.core_adc_i0_valid (core_adc_i0_valid),
.core_adc_q0_enable (core_adc_q0_enable),
.core_adc_q0_data (core_adc_q0_data),
.core_adc_q0_valid (core_adc_q0_valid),
.core_adc_i1_enable (core_adc_i1_enable),
.core_adc_i1_data (core_adc_i1_data),
.core_adc_i1_valid (core_adc_i1_valid),
.core_adc_q1_enable (core_adc_q1_enable),
.core_adc_q1_data (core_adc_q1_data),
.core_adc_q1_valid (core_adc_q1_valid)
);
system_wrapper i_system_wrapper ( system_wrapper i_system_wrapper (
.ddr_addr (ddr_addr), .ddr_addr (ddr_addr),
@ -306,7 +371,6 @@ module system_top (
.spi0_sdi_i (spi_miso), .spi0_sdi_i (spi_miso),
.spi0_sdo_i (1'b0), .spi0_sdo_i (1'b0),
.spi0_sdo_o (spi_mosi), .spi0_sdo_o (spi_mosi),
.tx_clk_out_n (tx_clk_out_n), .tx_clk_out_n (tx_clk_out_n),
.tx_clk_out_p (tx_clk_out_p), .tx_clk_out_p (tx_clk_out_p),
.tx_data_out_n (tx_data_out_n), .tx_data_out_n (tx_data_out_n),
@ -315,26 +379,58 @@ module system_top (
.tx_frame_out_p (tx_frame_out_p), .tx_frame_out_p (tx_frame_out_p),
// pr related ports // pr related ports
.clk (clk), .clk (clk),
.dma_dac_en(dma_dac_en), .up_adc_gpio_in (adc_gpio_input),
.dma_dac_dunf(dma_dac_dunf), .up_adc_gpio_out (adc_gpio_output),
.dma_dac_ddata(dma_dac_ddata), .up_dac_gpio_in (dac_gpio_input),
.dma_dac_dvalid(dma_dac_dvalid), .up_dac_gpio_out (dac_gpio_output),
.core_dac_en(core_dac_en), .dma_dac_i0_enable (dma_dac_i0_enable),
.core_dac_dunf(core_dac_dunf), .dma_dac_i0_data (dma_dac_i0_data),
.core_dac_ddata(core_dac_ddata), .dma_dac_i0_valid (dma_dac_i0_valid),
.core_dac_dvalid(core_dac_dvalid), .dma_dac_q0_enable (dma_dac_q0_enable),
.core_adc_dwr(core_adc_dwr), .dma_dac_q0_data (dma_dac_q0_data),
.core_adc_dsync(core_adc_dsync), .dma_dac_q0_valid (dma_dac_q0_valid),
.core_adc_ddata(core_adc_ddata), .dma_dac_i1_enable (dma_dac_i1_enable),
.core_adc_ovf(core_adc_ovf), .dma_dac_i1_data (dma_dac_i1_data),
.dma_adc_dwr(dma_adc_dwr), .dma_dac_i1_valid (dma_dac_i1_valid),
.dma_adc_dsync(dma_adc_dsync), .dma_dac_q1_enable (dma_dac_q1_enable),
.dma_adc_ddata(dma_adc_ddata), .dma_dac_q1_data (dma_dac_q1_data),
.dma_adc_ovf(dma_adc_ovf), .dma_dac_q1_valid (dma_dac_q1_valid),
.up_dac_gpio_in(dac_gpio_output), .core_dac_i0_enable (core_dac_i0_enable),
.up_adc_gpio_in(adc_gpio_output), .core_dac_i0_data (core_dac_i0_data),
.up_dac_gpio_out(dac_gpio_input), .core_dac_i0_valid (core_dac_i0_valid),
.up_adc_gpio_out(adc_gpio_input) .core_dac_q0_enable (core_dac_q0_enable),
.core_dac_q0_data (core_dac_q0_data),
.core_dac_q0_valid (core_dac_q0_valid),
.core_dac_i1_enable (core_dac_i1_enable),
.core_dac_i1_data (core_dac_i1_data),
.core_dac_i1_valid (core_dac_i1_valid),
.core_dac_q1_enable (core_dac_q1_enable),
.core_dac_q1_data (core_dac_q1_data),
.core_dac_q1_valid (core_dac_q1_valid),
.dma_adc_i0_enable (dma_adc_i0_enable),
.dma_adc_i0_data (dma_adc_i0_data),
.dma_adc_i0_valid (dma_adc_i0_valid),
.dma_adc_q0_enable (dma_adc_q0_enable),
.dma_adc_q0_data (dma_adc_q0_data),
.dma_adc_q0_valid (dma_adc_q0_valid),
.dma_adc_i1_enable (dma_adc_i1_enable),
.dma_adc_i1_data (dma_adc_i1_data),
.dma_adc_i1_valid (dma_adc_i1_valid),
.dma_adc_q1_enable (dma_adc_q1_enable),
.dma_adc_q1_data (dma_adc_q1_data),
.dma_adc_q1_valid (dma_adc_q1_valid),
.core_adc_i0_enable (core_adc_i0_enable),
.core_adc_i0_data (core_adc_i0_data),
.core_adc_i0_valid (core_adc_i0_valid),
.core_adc_q0_enable (core_adc_q0_enable),
.core_adc_q0_data (core_adc_q0_data),
.core_adc_q0_valid (core_adc_q0_valid),
.core_adc_i1_enable (core_adc_i1_enable),
.core_adc_i1_data (core_adc_i1_data),
.core_adc_i1_valid (core_adc_i1_valid),
.core_adc_q1_enable (core_adc_q1_enable),
.core_adc_q1_data (core_adc_q1_data),
.core_adc_q1_valid (core_adc_q1_valid)
); );
endmodule endmodule