diff --git a/library/Makefile b/library/Makefile index cdd204ef2..8c1ac4319 100644 --- a/library/Makefile +++ b/library/Makefile @@ -32,7 +32,7 @@ clean: make -C library/axi_clkgen clean make -C library/axi_dmac clean make -C library/util_adcfifo clean - make -C library/axi_fifo2s clean + make -C library/axi_adcfifo clean make -C library/axi_hdmi_rx clean make -C library/axi_hdmi_tx clean make -C library/axi_i2s_adi clean @@ -78,7 +78,7 @@ lib: -make -C axi_clkgen -make -C axi_dmac -make -C util_adcfifo - -make -C axi_fifo2s + -make -C axi_adcfifo -make -C axi_hdmi_rx -make -C axi_hdmi_tx -make -C axi_i2s_adi diff --git a/projects/common/zc706/zc706_system_plddr3.tcl b/projects/common/zc706/zc706_system_plddr3.tcl index 00f545958..144f0f300 100644 --- a/projects/common/zc706/zc706_system_plddr3.tcl +++ b/projects/common/zc706/zc706_system_plddr3.tcl @@ -40,38 +40,38 @@ proc p_plddr3_fifo {p_name m_name adc_data_width} { set_property -dict [list CONFIG.USE_BOARD_FLOW {true}] $axi_rstgen set_property -dict [list CONFIG.RESET_BOARD_INTERFACE {reset}] $axi_rstgen - set axi_fifo2s [create_bd_cell -type ip -vlnv analog.com:user:axi_fifo2s:1.0 axi_fifo2s] - set_property -dict [list CONFIG.ADC_DATA_WIDTH $adc_data_width] $axi_fifo2s - set_property -dict [list CONFIG.DMA_DATA_WIDTH {64}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_DATA_WIDTH {512}] $axi_fifo2s - set_property -dict [list CONFIG.DMA_READY_ENABLE {1}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_SIZE {6}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_LENGTH {4}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_ADDRESS {0x80000000}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_ADDRLIMIT {0xa0000000}] $axi_fifo2s - set_property -dict [list CONFIG.AXI_BYTE_WIDTH {64}] $axi_fifo2s + set axi_adcfifo [create_bd_cell -type ip -vlnv analog.com:user:axi_adcfifo:1.0 axi_adcfifo] + set_property -dict [list CONFIG.ADC_DATA_WIDTH $adc_data_width] $axi_adcfifo + set_property -dict [list CONFIG.DMA_DATA_WIDTH {64}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_DATA_WIDTH {512}] $axi_adcfifo + set_property -dict [list CONFIG.DMA_READY_ENABLE {1}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_SIZE {6}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_LENGTH {4}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_ADDRESS {0x80000000}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_ADDRLIMIT {0xa0000000}] $axi_adcfifo + set_property -dict [list CONFIG.AXI_BYTE_WIDTH {64}] $axi_adcfifo ad_connect sys_rst axi_ddr_cntrl/sys_rst ad_connect sys_clk axi_ddr_cntrl/SYS_CLK ad_connect ddr3 axi_ddr_cntrl/DDR3 - ad_connect axi_ddr_cntrl/S_AXI axi_fifo2s/axi - ad_connect adc_rst axi_fifo2s/adc_rst + ad_connect axi_ddr_cntrl/S_AXI axi_adcfifo/axi + ad_connect adc_rst axi_adcfifo/adc_rst ad_connect adc_rst axi_rstgen/ext_reset_in - ad_connect adc_clk axi_fifo2s/adc_clk - ad_connect adc_wr axi_fifo2s/adc_wr - ad_connect adc_wdata axi_fifo2s/adc_wdata - ad_connect adc_wovf axi_fifo2s/adc_wovf - ad_connect dma_clk axi_fifo2s/dma_clk - ad_connect dma_wr axi_fifo2s/dma_wr - ad_connect dma_wdata axi_fifo2s/dma_wdata - ad_connect dma_wready axi_fifo2s/dma_wready - ad_connect dma_xfer_req axi_fifo2s/dma_xfer_req - ad_connect dma_xfer_status axi_fifo2s/dma_xfer_status + ad_connect adc_clk axi_adcfifo/adc_clk + ad_connect adc_wr axi_adcfifo/adc_wr + ad_connect adc_wdata axi_adcfifo/adc_wdata + ad_connect adc_wovf axi_adcfifo/adc_wovf + ad_connect dma_clk axi_adcfifo/dma_clk + ad_connect dma_wr axi_adcfifo/dma_wr + ad_connect dma_wdata axi_adcfifo/dma_wdata + ad_connect dma_wready axi_adcfifo/dma_wready + ad_connect dma_xfer_req axi_adcfifo/dma_xfer_req + ad_connect dma_xfer_status axi_adcfifo/dma_xfer_status ad_connect axi_clk axi_ddr_cntrl/ui_clk - ad_connect axi_clk axi_fifo2s/axi_clk + ad_connect axi_clk axi_adcfifo/axi_clk ad_connect axi_clk axi_rstgen/slowest_sync_clk ad_connect axi_resetn axi_rstgen/peripheral_aresetn - ad_connect axi_resetn axi_fifo2s/axi_resetn + ad_connect axi_resetn axi_adcfifo/axi_resetn ad_connect axi_resetn axi_ddr_cntrl/aresetn current_bd_instance $c_instance diff --git a/projects/daq2/zc706/Makefile b/projects/daq2/zc706/Makefile index 09fe01302..806f116d8 100644 --- a/projects/daq2/zc706/Makefile +++ b/projects/daq2/zc706/Makefile @@ -16,7 +16,7 @@ M_DEPS += ../../common/zc706/zc706_system_plddr3.tcl M_DEPS += ../common/daq2_bd.tcl M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr -M_DEPS += ../../../library/axi_fifo2s/axi_fifo2s.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_ad9680/axi_ad9680.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr @@ -43,7 +43,7 @@ clean-all: rm -rf $(F_LIST) make -C ../../../library/axi_jesd_gt clean make -C ../../../library/util_bsplit clean - make -C ../../../library/axi_fifo2s clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_ad9680 clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_spdif_tx clean @@ -62,7 +62,7 @@ daq2_zc706.xpr: lib $(M_DEPS) lib: make -C ../../../library/axi_jesd_gt make -C ../../../library/util_bsplit - make -C ../../../library/axi_fifo2s + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_ad9680 make -C ../../../library/axi_dmac make -C ../../../library/axi_spdif_tx diff --git a/projects/daq2/zc706/system_bd.tcl b/projects/daq2/zc706/system_bd.tcl index 79e3a3496..e119fda89 100644 --- a/projects/daq2/zc706/system_bd.tcl +++ b/projects/daq2/zc706/system_bd.tcl @@ -15,7 +15,7 @@ ad_connect sys_clk axi_ad9680_fifo/sys_clk ad_connect ddr3 axi_ad9680_fifo/ddr3 create_bd_addr_seg -range 0x40000000 -offset 0x80000000 \ - [get_bd_addr_spaces axi_ad9680_fifo/axi_fifo2s/axi] \ + [get_bd_addr_spaces axi_ad9680_fifo/axi_adcfifo/axi] \ [get_bd_addr_segs axi_ad9680_fifo/axi_ddr_cntrl/memmap/memaddr] \ SEG_axi_ddr_cntrl_memaddr diff --git a/projects/daq3/zc706/Makefile b/projects/daq3/zc706/Makefile index 5e0822fb2..508faf1c1 100644 --- a/projects/daq3/zc706/Makefile +++ b/projects/daq3/zc706/Makefile @@ -16,7 +16,7 @@ M_DEPS += ../../common/zc706/zc706_system_plddr3.tcl M_DEPS += ../common/daq3_bd.tcl M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr -M_DEPS += ../../../library/axi_fifo2s/axi_fifo2s.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_ad9680/axi_ad9680.xpr M_DEPS += ../../../library/axi_ad9152/axi_ad9152.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr @@ -43,7 +43,7 @@ clean-all: rm -rf $(F_LIST) make -C ../../../library/axi_jesd_gt clean make -C ../../../library/util_bsplit clean - make -C ../../../library/axi_fifo2s clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_ad9680 clean make -C ../../../library/axi_ad9152 clean make -C ../../../library/axi_dmac clean @@ -62,7 +62,7 @@ daq3_zc706.xpr: lib $(M_DEPS) lib: make -C ../../../library/axi_jesd_gt make -C ../../../library/util_bsplit - make -C ../../../library/axi_fifo2s + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_ad9680 make -C ../../../library/axi_ad9152 make -C ../../../library/axi_dmac diff --git a/projects/daq3/zc706/system_bd.tcl b/projects/daq3/zc706/system_bd.tcl index e1c0bb09e..7b25a1a4e 100644 --- a/projects/daq3/zc706/system_bd.tcl +++ b/projects/daq3/zc706/system_bd.tcl @@ -15,7 +15,7 @@ ad_connect sys_clk axi_ad9680_fifo/sys_clk ad_connect ddr3 axi_ad9680_fifo/ddr3 create_bd_addr_seg -range 0x40000000 -offset 0x80000000 \ - [get_bd_addr_spaces axi_ad9680_fifo/axi_fifo2s/axi] \ + [get_bd_addr_spaces axi_ad9680_fifo/axi_adcfifo/axi] \ [get_bd_addr_segs axi_ad9680_fifo/axi_ddr_cntrl/memmap/memaddr] \ SEG_axi_ddr_cntrl_memaddr diff --git a/projects/fmcadc2/zc706/Makefile b/projects/fmcadc2/zc706/Makefile index 34f19cb99..d081c362f 100644 --- a/projects/fmcadc2/zc706/Makefile +++ b/projects/fmcadc2/zc706/Makefile @@ -17,7 +17,7 @@ M_DEPS += ../common/fmcadc2_bd.tcl M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/axi_ad9625/axi_ad9625.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr -M_DEPS += ../../../library/axi_fifo2s/axi_fifo2s.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr @@ -42,7 +42,7 @@ clean-all: make -C ../../../library/axi_jesd_gt clean make -C ../../../library/axi_ad9625 clean make -C ../../../library/util_bsplit clean - make -C ../../../library/axi_fifo2s clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_spdif_tx clean make -C ../../../library/axi_clkgen clean @@ -59,7 +59,7 @@ lib: make -C ../../../library/axi_jesd_gt make -C ../../../library/axi_ad9625 make -C ../../../library/util_bsplit - make -C ../../../library/axi_fifo2s + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_dmac make -C ../../../library/axi_spdif_tx make -C ../../../library/axi_clkgen diff --git a/projects/fmcadc2/zc706/system_bd.tcl b/projects/fmcadc2/zc706/system_bd.tcl index 784d01b95..0796a0972 100644 --- a/projects/fmcadc2/zc706/system_bd.tcl +++ b/projects/fmcadc2/zc706/system_bd.tcl @@ -15,7 +15,7 @@ ad_connect sys_clk axi_ad9625_fifo/sys_clk ad_connect ddr3 axi_ad9625_fifo/ddr3 create_bd_addr_seg -range 0x40000000 -offset 0x80000000 \ - [get_bd_addr_spaces axi_ad9625_fifo/axi_fifo2s/axi] \ + [get_bd_addr_spaces axi_ad9625_fifo/axi_adcfifo/axi] \ [get_bd_addr_segs axi_ad9625_fifo/axi_ddr_cntrl/memmap/memaddr] \ SEG_axi_ddr_cntrl_memaddr diff --git a/projects/fmcadc4/zc706/Makefile b/projects/fmcadc4/zc706/Makefile index e3ca31b7e..0350e2d0c 100644 --- a/projects/fmcadc4/zc706/Makefile +++ b/projects/fmcadc4/zc706/Makefile @@ -16,7 +16,7 @@ M_DEPS += ../../common/zc706/zc706_system_plddr3.tcl M_DEPS += ../common/fmcadc4_bd.tcl M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr -M_DEPS += ../../../library/axi_fifo2s/axi_fifo2s.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr @@ -41,7 +41,7 @@ clean-all: rm -rf $(F_LIST) make -C ../../../library/axi_jesd_gt clean make -C ../../../library/util_bsplit clean - make -C ../../../library/axi_fifo2s clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_spdif_tx clean make -C ../../../library/axi_clkgen clean @@ -58,7 +58,7 @@ fmcadc4_zc706.xpr: lib $(M_DEPS) lib: make -C ../../../library/axi_jesd_gt make -C ../../../library/util_bsplit - make -C ../../../library/axi_fifo2s + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_dmac make -C ../../../library/axi_spdif_tx make -C ../../../library/axi_clkgen diff --git a/projects/fmcadc4/zc706/system_bd.tcl b/projects/fmcadc4/zc706/system_bd.tcl index 297367640..07741b3d9 100644 --- a/projects/fmcadc4/zc706/system_bd.tcl +++ b/projects/fmcadc4/zc706/system_bd.tcl @@ -15,7 +15,7 @@ ad_connect sys_clk axi_ad9234_fifo/sys_clk ad_connect ddr3 axi_ad9234_fifo/ddr3 create_bd_addr_seg -range 0x40000000 -offset 0x80000000 \ - [get_bd_addr_spaces axi_ad9234_fifo/axi_fifo2s/axi] \ + [get_bd_addr_spaces axi_ad9234_fifo/axi_adcfifo/axi] \ [get_bd_addr_segs axi_ad9234_fifo/axi_ddr_cntrl/memmap/memaddr] \ SEG_axi_ddr_cntrl_memaddr diff --git a/projects/fmcomms7/zc706/Makefile b/projects/fmcomms7/zc706/Makefile index 645728baf..63f797cdf 100644 --- a/projects/fmcomms7/zc706/Makefile +++ b/projects/fmcomms7/zc706/Makefile @@ -16,7 +16,7 @@ M_DEPS += ../../common/zc706/zc706_system_plddr3.tcl M_DEPS += ../common/fmcomms7_bd.tcl M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr -M_DEPS += ../../../library/axi_fifo2s/axi_fifo2s.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_ad9680/axi_ad9680.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr @@ -43,7 +43,7 @@ clean-all: rm -rf $(F_LIST) make -C ../../../library/axi_jesd_gt clean make -C ../../../library/util_bsplit clean - make -C ../../../library/axi_fifo2s clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_ad9680 clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_spdif_tx clean @@ -62,7 +62,7 @@ fmcomms7_zc706.xpr: lib $(M_DEPS) lib: make -C ../../../library/axi_jesd_gt make -C ../../../library/util_bsplit - make -C ../../../library/axi_fifo2s + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_ad9680 make -C ../../../library/axi_dmac make -C ../../../library/axi_spdif_tx diff --git a/projects/fmcomms7/zc706/system_bd.tcl b/projects/fmcomms7/zc706/system_bd.tcl index 829d4ded2..84f7b38f5 100644 --- a/projects/fmcomms7/zc706/system_bd.tcl +++ b/projects/fmcomms7/zc706/system_bd.tcl @@ -15,7 +15,7 @@ ad_connect sys_clk axi_ad9680_fifo/sys_clk ad_connect ddr3 axi_ad9680_fifo/ddr3 create_bd_addr_seg -range 0x40000000 -offset 0x80000000 \ - [get_bd_addr_spaces axi_ad9680_fifo/axi_fifo2s/axi] \ + [get_bd_addr_spaces axi_ad9680_fifo/axi_adcfifo/axi] \ [get_bd_addr_segs axi_ad9680_fifo/axi_ddr_cntrl/memmap/memaddr] \ SEG_axi_ddr_cntrl_memaddr