From 9a917ae8bf6df9fc5fcf1a426881db505590d78d Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 5 May 2017 18:52:26 +0200 Subject: [PATCH] fmcadc4: Convert to ADI JESD204 Convert the FMCADC4 project to the ADI JESD204 link layer core. The change is very straight forward, but a matching change on the software side is required. Signed-off-by: Lars-Peter Clausen --- projects/fmcadc4/common/fmcadc4_bd.tcl | 14 +++++++------- projects/fmcadc4/zc706/Makefile | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/projects/fmcadc4/common/fmcadc4_bd.tcl b/projects/fmcadc4/common/fmcadc4_bd.tcl index fdb380704..89c99682c 100644 --- a/projects/fmcadc4/common/fmcadc4_bd.tcl +++ b/projects/fmcadc4/common/fmcadc4_bd.tcl @@ -1,4 +1,6 @@ +source $ad_hdl_dir/library/jesd204/scripts/jesd204.tcl + # fmcadc4 # adc peripherals @@ -13,9 +15,7 @@ ad_ip_parameter axi_ad9680_xcvr CONFIG.NUM_OF_LANES 8 ad_ip_parameter axi_ad9680_xcvr CONFIG.QPLL_ENABLE 1 ad_ip_parameter axi_ad9680_xcvr CONFIG.TX_OR_RX_N 0 -ad_ip_instance jesd204 axi_ad9680_jesd -ad_ip_parameter axi_ad9680_jesd CONFIG.C_NODE_IS_TRANSMIT 0 -ad_ip_parameter axi_ad9680_jesd CONFIG.C_LANES 8 +adi_axi_jesd204_rx_create axi_ad9680_jesd 8 ad_ip_instance axi_dmac axi_ad9680_dma ad_ip_parameter axi_ad9680_dma CONFIG.DMA_TYPE_SRC 1 @@ -59,9 +59,9 @@ ad_xcvrcon util_fmcadc4_xcvr axi_ad9680_xcvr axi_ad9680_jesd ad_connect util_fmcadc4_xcvr/rx_out_clk_0 axi_ad9680_cpack/adc_clk ad_connect util_fmcadc4_xcvr/rx_out_clk_0 axi_ad9680_core_0/rx_clk ad_connect util_fmcadc4_xcvr/rx_out_clk_0 axi_ad9680_core_1/rx_clk -ad_connect axi_ad9680_jesd/rx_start_of_frame axi_ad9680_core_0/rx_sof -ad_connect axi_ad9680_jesd/rx_start_of_frame axi_ad9680_core_1/rx_sof -ad_connect axi_ad9680_jesd/rx_tdata util_bsplit_rx_data/data +ad_connect axi_ad9680_jesd/rx_sof axi_ad9680_core_0/rx_sof +ad_connect axi_ad9680_jesd/rx_sof axi_ad9680_core_1/rx_sof +ad_connect axi_ad9680_jesd/rx_data_tdata util_bsplit_rx_data/data ad_connect axi_ad9680_jesd_rstgen/peripheral_reset axi_ad9680_cpack/adc_rst # connections (adc) @@ -101,7 +101,7 @@ ad_connect sys_cpu_resetn util_fmcadc4_xcvr/up_rstn ad_cpu_interconnect 0x44A60000 axi_ad9680_xcvr ad_cpu_interconnect 0x44A00000 axi_ad9680_core_0 ad_cpu_interconnect 0x44A10000 axi_ad9680_core_1 -ad_cpu_interconnect 0x44A91000 axi_ad9680_jesd +ad_cpu_interconnect 0x44AA0000 axi_ad9680_jesd ad_cpu_interconnect 0x7c400000 axi_ad9680_dma # gt uses hp3, and 100MHz clock for both DRP and AXI4 diff --git a/projects/fmcadc4/zc706/Makefile b/projects/fmcadc4/zc706/Makefile index 871f5c728..fd637fece 100644 --- a/projects/fmcadc4/zc706/Makefile +++ b/projects/fmcadc4/zc706/Makefile @@ -19,13 +19,16 @@ M_DEPS += ../../common/zc706/zc706_system_bd.tcl M_DEPS += ../../common/zc706/zc706_plddr3_constr.xdc M_DEPS += ../../common/zc706/zc706_plddr3_adcfifo_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v +M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/axi_ad9680/axi_ad9680.xpr M_DEPS += ../../../library/xilinx/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/xilinx/axi_adxcvr/axi_adxcvr.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_hdmi_tx/axi_hdmi_tx.xpr +M_DEPS += ../../../library/jesd204/axi_jesd204_rx/axi_jesd204_rx.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr +M_DEPS += ../../../library/jesd204/jesd204_rx/jesd204_rx.xpr M_DEPS += ../../../library/xilinx/util_adxcvr/util_adxcvr.xpr M_DEPS += ../../../library/util_bsplit/util_bsplit.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr @@ -63,7 +66,9 @@ clean-all:clean make -C ../../../library/axi_clkgen clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_hdmi_tx clean + make -C ../../../library/jesd204/axi_jesd204_rx clean make -C ../../../library/axi_spdif_tx clean + make -C ../../../library/jesd204/jesd204_rx clean make -C ../../../library/xilinx/util_adxcvr clean make -C ../../../library/util_bsplit clean make -C ../../../library/util_cpack clean @@ -81,7 +86,9 @@ lib: make -C ../../../library/axi_clkgen make -C ../../../library/axi_dmac make -C ../../../library/axi_hdmi_tx + make -C ../../../library/jesd204/axi_jesd204_rx make -C ../../../library/axi_spdif_tx + make -C ../../../library/jesd204/jesd204_rx make -C ../../../library/xilinx/util_adxcvr make -C ../../../library/util_bsplit make -C ../../../library/util_cpack