From 5ca79e843c39121b2dd9aa046f46f8b73b02796c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 5 May 2017 18:56:41 +0200 Subject: [PATCH] ad6676evb: Convert to ADI JESD204 Convert the AD6676EVB 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/ad6676evb/common/ad6676evb_bd.tcl | 12 ++++++------ projects/ad6676evb/vc707/Makefile | 7 +++++++ projects/ad6676evb/zc706/Makefile | 7 +++++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/projects/ad6676evb/common/ad6676evb_bd.tcl b/projects/ad6676evb/common/ad6676evb_bd.tcl index 697bd05d3..f7d7277fd 100644 --- a/projects/ad6676evb/common/ad6676evb_bd.tcl +++ b/projects/ad6676evb/common/ad6676evb_bd.tcl @@ -1,4 +1,6 @@ +source $ad_hdl_dir/library/jesd204/scripts/jesd204.tcl + # adc peripherals ad_ip_instance axi_adxcvr axi_ad6676_xcvr @@ -9,9 +11,7 @@ ad_ip_parameter axi_ad6676_xcvr CONFIG.LPM_OR_DFE_N 0 ad_ip_parameter axi_ad6676_xcvr CONFIG.SYS_CLK_SEL "00" ad_ip_parameter axi_ad6676_xcvr CONFIG.OUT_CLK_SEL "100" -ad_ip_instance jesd204 axi_ad6676_jesd -ad_ip_parameter axi_ad6676_jesd CONFIG.C_NODE_IS_TRANSMIT 0 -ad_ip_parameter axi_ad6676_jesd CONFIG.C_LANES 2 +adi_axi_jesd204_rx_create axi_ad6676_jesd 2 ad_ip_instance axi_ad6676 axi_ad6676_core @@ -61,8 +61,8 @@ ad_connect sys_cpu_clk util_ad6676_xcvr/up_clk ad_xcvrcon util_ad6676_xcvr axi_ad6676_xcvr axi_ad6676_jesd ad_connect util_ad6676_xcvr/rx_out_clk_0 axi_ad6676_core/rx_clk ad_connect util_ad6676_xcvr/rx_out_clk_0 rx_core_clk -ad_connect axi_ad6676_jesd/rx_start_of_frame axi_ad6676_core/rx_sof -ad_connect axi_ad6676_jesd/rx_tdata axi_ad6676_core/rx_data +ad_connect axi_ad6676_jesd/rx_sof axi_ad6676_core/rx_sof +ad_connect axi_ad6676_jesd/rx_data_tdata axi_ad6676_core/rx_data ad_connect util_ad6676_xcvr/rx_out_clk_0 axi_ad6676_cpack/adc_clk ad_connect axi_ad6676_jesd_rstgen/peripheral_reset axi_ad6676_cpack/adc_rst ad_connect axi_ad6676_core/adc_enable_0 axi_ad6676_cpack/adc_enable_0 @@ -81,7 +81,7 @@ ad_connect axi_ad6676_core/adc_dovf axi_ad6676_dma/fifo_wr_overflow ad_cpu_interconnect 0x44A60000 axi_ad6676_xcvr ad_cpu_interconnect 0x44A10000 axi_ad6676_core -ad_cpu_interconnect 0x44A91000 axi_ad6676_jesd +ad_cpu_interconnect 0x44AA0000 axi_ad6676_jesd ad_cpu_interconnect 0x7c420000 axi_ad6676_dma # xcvr uses hp3, and 100MHz clock for both DRP and AXI4 diff --git a/projects/ad6676evb/vc707/Makefile b/projects/ad6676evb/vc707/Makefile index d7ab4a93c..3d3c387be 100644 --- a/projects/ad6676evb/vc707/Makefile +++ b/projects/ad6676evb/vc707/Makefile @@ -17,10 +17,13 @@ M_DEPS += ../../common/vc707/vc707_system_mig.prj M_DEPS += ../../common/vc707/vc707_system_constr.xdc M_DEPS += ../../common/vc707/vc707_system_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v +M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/common/ad_sysref_gen.v M_DEPS += ../../../library/axi_ad6676/axi_ad6676.xpr M_DEPS += ../../../library/xilinx/axi_adxcvr/axi_adxcvr.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr +M_DEPS += ../../../library/jesd204/axi_jesd204_rx/axi_jesd204_rx.xpr +M_DEPS += ../../../library/jesd204/jesd204_rx/jesd204_rx.xpr M_DEPS += ../../../library/xilinx/util_adxcvr/util_adxcvr.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr @@ -54,6 +57,8 @@ clean-all:clean make -C ../../../library/axi_ad6676 clean make -C ../../../library/xilinx/axi_adxcvr clean make -C ../../../library/axi_dmac clean + make -C ../../../library/jesd204/axi_jesd204_rx clean + make -C ../../../library/jesd204/jesd204_rx clean make -C ../../../library/xilinx/util_adxcvr clean make -C ../../../library/util_cpack clean @@ -67,6 +72,8 @@ lib: make -C ../../../library/axi_ad6676 make -C ../../../library/xilinx/axi_adxcvr make -C ../../../library/axi_dmac + make -C ../../../library/jesd204/axi_jesd204_rx + make -C ../../../library/jesd204/jesd204_rx make -C ../../../library/xilinx/util_adxcvr make -C ../../../library/util_cpack diff --git a/projects/ad6676evb/zc706/Makefile b/projects/ad6676evb/zc706/Makefile index 62979f9e8..5871b3b45 100644 --- a/projects/ad6676evb/zc706/Makefile +++ b/projects/ad6676evb/zc706/Makefile @@ -16,13 +16,16 @@ M_DEPS += ../../scripts/adi_board.tcl M_DEPS += ../../common/zc706/zc706_system_constr.xdc M_DEPS += ../../common/zc706/zc706_system_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v +M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/common/ad_sysref_gen.v M_DEPS += ../../../library/axi_ad6676/axi_ad6676.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_cpack/util_cpack.xpr @@ -58,7 +61,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_cpack clean @@ -74,7 +79,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_cpack