From bb0cdf2f5e0b159fe912bbd13f04dee5354140cf Mon Sep 17 00:00:00 2001 From: Istvan Csomortani Date: Fri, 21 Apr 2017 15:09:37 +0300 Subject: [PATCH] fmcomms2: Update IP instantiations --- projects/fmcomms2/ac701/system_bd.tcl | 2 +- projects/fmcomms2/common/fmcomms2_bd.tcl | 86 ++++++++++++------------ projects/fmcomms2/kc705/system_bd.tcl | 2 +- projects/fmcomms2/mitx045/system_bd.tcl | 2 +- projects/fmcomms2/vc707/system_bd.tcl | 2 +- projects/fmcomms2/zc702/system_bd.tcl | 2 +- projects/fmcomms2/zc706/system_bd.tcl | 2 +- projects/fmcomms2/zcu102/system_bd.tcl | 6 +- projects/fmcomms2/zed/system_bd.tcl | 2 +- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/projects/fmcomms2/ac701/system_bd.tcl b/projects/fmcomms2/ac701/system_bd.tcl index 98e4be1cb..1edd0a655 100644 --- a/projects/fmcomms2/ac701/system_bd.tcl +++ b/projects/fmcomms2/ac701/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/ac701/ac701_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 25 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 25 diff --git a/projects/fmcomms2/common/fmcomms2_bd.tcl b/projects/fmcomms2/common/fmcomms2_bd.tcl index bfecb54ad..e29b393c5 100644 --- a/projects/fmcomms2/common/fmcomms2_bd.tcl +++ b/projects/fmcomms2/common/fmcomms2_bd.tcl @@ -26,60 +26,60 @@ create_bd_port -dir O tdd_sync_t # ad9361 core -set axi_ad9361 [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9361:1.0 axi_ad9361] -set_property -dict [list CONFIG.ID {0}] $axi_ad9361 +ad_ip_instance axi_ad9361 axi_ad9361 +ad_ip_parameter axi_ad9361 CONFIG.ID 0 -set axi_ad9361_dac_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_dac_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {2}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.CYCLIC {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.SYNC_TRANSFER_START {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $axi_ad9361_dac_dma +ad_ip_instance axi_dmac axi_ad9361_dac_dma +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_DEST 2 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.CYCLIC 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.SYNC_TRANSFER_START 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_DEST 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_DATA_WIDTH_DEST 64 -set util_ad9361_dac_upack [create_bd_cell -type ip -vlnv analog.com:user:util_upack:1.0 util_ad9361_dac_upack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_dac_upack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_dac_upack +ad_ip_instance util_upack util_ad9361_dac_upack +ad_ip_parameter util_ad9361_dac_upack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_dac_upack CONFIG.CHANNEL_DATA_WIDTH 16 -set axi_ad9361_adc_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_adc_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {2}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.SYNC_TRANSFER_START {1}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $axi_ad9361_adc_dma +ad_ip_instance axi_dmac axi_ad9361_adc_dma +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_SRC 2 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.CYCLIC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.SYNC_TRANSFER_START 1 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_DATA_WIDTH_SRC 64 -set util_ad9361_adc_pack [create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 util_ad9361_adc_pack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_pack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_adc_pack +ad_ip_instance util_cpack util_ad9361_adc_pack +ad_ip_parameter util_ad9361_adc_pack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_pack CONFIG.CHANNEL_DATA_WIDTH 16 -set util_ad9361_adc_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_wfifo:1.0 util_ad9361_adc_fifo] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $util_ad9361_adc_fifo +ad_ip_instance util_wfifo util_ad9361_adc_fifo +ad_ip_parameter util_ad9361_adc_fifo CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_ADDRESS_WIDTH 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DOUT_DATA_WIDTH 16 -set util_ad9361_tdd_sync [create_bd_cell -type ip -vlnv analog.com:user:util_tdd_sync:1.0 util_ad9361_tdd_sync] -set_property -dict [list CONFIG.TDD_SYNC_PERIOD {10000000}] $util_ad9361_tdd_sync +ad_ip_instance util_tdd_sync util_ad9361_tdd_sync +ad_ip_parameter util_ad9361_tdd_sync CONFIG.TDD_SYNC_PERIOD 10000000 -set clkdiv [ create_bd_cell -type ip -vlnv analog.com:user:util_clkdiv:1.0 clkdiv ] +ad_ip_instance util_clkdiv clkdiv -set clkdiv_reset [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 clkdiv_reset] +ad_ip_instance proc_sys_reset clkdiv_reset -set dac_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_rfifo:1.0 dac_fifo] -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $dac_fifo +ad_ip_instance util_rfifo dac_fifo +ad_ip_parameter dac_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DOUT_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DIN_ADDRESS_WIDTH 4 -set clkdiv_sel_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:util_reduced_logic:2.0 clkdiv_sel_logic] -set_property -dict [list CONFIG.C_SIZE {2}] $clkdiv_sel_logic +ad_ip_instance util_reduced_logic clkdiv_sel_logic +ad_ip_parameter clkdiv_sel_logic CONFIG.C_SIZE 2 -set concat_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 concat_logic] -set_property -dict [list CONFIG.NUM_PORTS {2}] $concat_logic +ad_ip_instance xlconcat concat_logic +ad_ip_parameter concat_logic CONFIG.NUM_PORTS 2 # connections diff --git a/projects/fmcomms2/kc705/system_bd.tcl b/projects/fmcomms2/kc705/system_bd.tcl index e68912c74..d5c6bea53 100644 --- a/projects/fmcomms2/kc705/system_bd.tcl +++ b/projects/fmcomms2/kc705/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 31 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 31 diff --git a/projects/fmcomms2/mitx045/system_bd.tcl b/projects/fmcomms2/mitx045/system_bd.tcl index 5471d85d9..3f0586c10 100755 --- a/projects/fmcomms2/mitx045/system_bd.tcl +++ b/projects/fmcomms2/mitx045/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/mitx045/mitx045_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 20 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 20 diff --git a/projects/fmcomms2/vc707/system_bd.tcl b/projects/fmcomms2/vc707/system_bd.tcl index 9bc825f22..224969d52 100644 --- a/projects/fmcomms2/vc707/system_bd.tcl +++ b/projects/fmcomms2/vc707/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 22 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 22 diff --git a/projects/fmcomms2/zc702/system_bd.tcl b/projects/fmcomms2/zc702/system_bd.tcl index 795a6dddf..e11537d70 100644 --- a/projects/fmcomms2/zc702/system_bd.tcl +++ b/projects/fmcomms2/zc702/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 23 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23 diff --git a/projects/fmcomms2/zc706/system_bd.tcl b/projects/fmcomms2/zc706/system_bd.tcl index 9b661277a..f053f056d 100755 --- a/projects/fmcomms2/zc706/system_bd.tcl +++ b/projects/fmcomms2/zc706/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 20 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 20 diff --git a/projects/fmcomms2/zcu102/system_bd.tcl b/projects/fmcomms2/zcu102/system_bd.tcl index f083e7fcd..d71381861 100755 --- a/projects/fmcomms2/zcu102/system_bd.tcl +++ b/projects/fmcomms2/zcu102/system_bd.tcl @@ -2,8 +2,8 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property -dict [list CONFIG.SIM_DEVICE {ULTRASCALE}] $clkdiv +ad_ip_parameter clkdiv CONFIG.SIM_DEVICE ULTRASCALE -set_property CONFIG.DEVICE_TYPE 2 [get_bd_cells axi_ad9361] -set_property CONFIG.ADC_INIT_DELAY 11 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.DEVICE_TYPE 2 +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 11 diff --git a/projects/fmcomms2/zed/system_bd.tcl b/projects/fmcomms2/zed/system_bd.tcl index 0154a4b8f..76f8cb26f 100644 --- a/projects/fmcomms2/zed/system_bd.tcl +++ b/projects/fmcomms2/zed/system_bd.tcl @@ -2,5 +2,5 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/fmcomms2_bd.tcl -set_property CONFIG.ADC_INIT_DELAY 23 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23