diff --git a/projects/ad6676evb/common/ad6676evb_bd.tcl b/projects/ad6676evb/common/ad6676evb_bd.tcl index b7586e9de..6bfd35617 100644 --- a/projects/ad6676evb/common/ad6676evb_bd.tcl +++ b/projects/ad6676evb/common/ad6676evb_bd.tcl @@ -1,6 +1,12 @@ source $ad_hdl_dir/library/jesd204/scripts/jesd204.tcl +# JESD204B interface configuration parameters +set RX_NUM_OF_LANES 2 +set RX_NUM_OF_CONVERTERS 2 +set RX_SAMPLES_PER_FRAME 1 +set RX_SAMPLE_WIDTH 16 + # adc peripherals ad_ip_instance axi_adxcvr axi_ad6676_xcvr @@ -13,7 +19,11 @@ ad_ip_parameter axi_ad6676_xcvr CONFIG.OUT_CLK_SEL 0x4 adi_axi_jesd204_rx_create axi_ad6676_jesd 2 -ad_ip_instance axi_ad6676 axi_ad6676_core +#ad_ip_instance axi_ad6676 axi_ad6676_core +adi_tpl_jesd204_rx_create axi_ad6676_core $RX_NUM_OF_LANES \ + $RX_NUM_OF_CONVERTERS \ + $RX_SAMPLES_PER_FRAME \ + $RX_SAMPLE_WIDTH \ ad_ip_instance util_cpack2 axi_ad6676_cpack { \ NUM_OF_CHANNELS 2 \ @@ -61,10 +71,11 @@ ad_connect $sys_cpu_clk util_ad6676_xcvr/up_clk # connections (adc) 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 axi_ad6676_core/link_clk ad_connect util_ad6676_xcvr/rx_out_clk_0 rx_core_clk -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 axi_ad6676_jesd/rx_sof axi_ad6676_core/link_sof +ad_connect axi_ad6676_jesd/rx_data_tdata axi_ad6676_core/link_data +ad_connect axi_ad6676_jesd/rx_data_tvalid axi_ad6676_core/link_valid ad_connect util_ad6676_xcvr/rx_out_clk_0 axi_ad6676_cpack/clk ad_connect axi_ad6676_jesd_rstgen/peripheral_reset axi_ad6676_cpack/reset @@ -74,7 +85,7 @@ for {set i 0} {$i < 2} {incr i} { ad_connect axi_ad6676_core/adc_enable_${i} axi_ad6676_cpack/enable_${i} ad_connect axi_ad6676_core/adc_data_${i} axi_ad6676_cpack/fifo_wr_data_${i} } -ad_connect axi_ad6676_core/adc_clk axi_ad6676_dma/fifo_wr_clk +ad_connect axi_ad6676_core/link_clk axi_ad6676_dma/fifo_wr_clk ad_connect axi_ad6676_dma/fifo_wr axi_ad6676_cpack/packed_fifo_wr # interconnect (cpu) diff --git a/projects/ad6676evb/vc707/Makefile b/projects/ad6676evb/vc707/Makefile index 7d204c031..30305bf57 100644 --- a/projects/ad6676evb/vc707/Makefile +++ b/projects/ad6676evb/vc707/Makefile @@ -15,9 +15,9 @@ M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/common/ad_sysref_gen.v M_DEPS += ../../../library/common/ad_iobuf.v -LIB_DEPS += axi_ad6676 LIB_DEPS += axi_dmac LIB_DEPS += axi_sysid +LIB_DEPS += jesd204/ad_ip_jesd204_tpl_adc LIB_DEPS += jesd204/axi_jesd204_rx LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += sysid_rom diff --git a/projects/ad6676evb/zc706/Makefile b/projects/ad6676evb/zc706/Makefile index 87066e69b..09a77433e 100644 --- a/projects/ad6676evb/zc706/Makefile +++ b/projects/ad6676evb/zc706/Makefile @@ -14,12 +14,12 @@ M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/common/ad_sysref_gen.v M_DEPS += ../../../library/common/ad_iobuf.v -LIB_DEPS += axi_ad6676 LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx LIB_DEPS += axi_sysid +LIB_DEPS += jesd204/ad_ip_jesd204_tpl_adc LIB_DEPS += jesd204/axi_jesd204_rx LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += sysid_rom