diff --git a/projects/adrv9371x/a10gx/Makefile b/projects/adrv9371x/a10gx/Makefile index e352fbfd0..f657f5354 100644 --- a/projects/adrv9371x/a10gx/Makefile +++ b/projects/adrv9371x/a10gx/Makefile @@ -13,8 +13,8 @@ M_DEPS += ../../common/a10gx/a10gx_system_assign.tcl LIB_DEPS += altera/adi_jesd204 LIB_DEPS += axi_ad9371 LIB_DEPS += axi_dmac -LIB_DEPS += util_cpack LIB_DEPS += util_dacfifo -LIB_DEPS += util_upack +LIB_DEPS += util_pack/util_cpack2 +LIB_DEPS += util_pack/util_upack2 include ../../scripts/project-altera.mk diff --git a/projects/adrv9371x/a10soc/Makefile b/projects/adrv9371x/a10soc/Makefile index 87b38cdb5..fa360b0ab 100644 --- a/projects/adrv9371x/a10soc/Makefile +++ b/projects/adrv9371x/a10soc/Makefile @@ -15,7 +15,7 @@ LIB_DEPS += altera/adi_jesd204 LIB_DEPS += altera/avl_dacfifo LIB_DEPS += axi_ad9371 LIB_DEPS += axi_dmac -LIB_DEPS += util_cpack -LIB_DEPS += util_upack +LIB_DEPS += util_pack/util_cpack2 +LIB_DEPS += util_pack/util_upack2 include ../../scripts/project-altera.mk diff --git a/projects/adrv9371x/common/adrv9371x_bd.tcl b/projects/adrv9371x/common/adrv9371x_bd.tcl index 96071c25f..4bc07c5c6 100644 --- a/projects/adrv9371x/common/adrv9371x_bd.tcl +++ b/projects/adrv9371x/common/adrv9371x_bd.tcl @@ -24,9 +24,11 @@ ad_ip_parameter axi_ad9371_tx_xcvr CONFIG.LPM_OR_DFE_N 0 adi_axi_jesd204_tx_create axi_ad9371_tx_jesd 4 -ad_ip_instance util_upack util_ad9371_tx_upack -ad_ip_parameter util_ad9371_tx_upack CONFIG.CHANNEL_DATA_WIDTH 32 -ad_ip_parameter util_ad9371_tx_upack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_instance util_upack2 util_ad9371_tx_upack { \ + NUM_OF_CHANNELS 4 \ + SAMPLES_PER_CHANNEL 2 \ + SAMPLE_DATA_WIDTH 16 \ +} ad_ip_instance axi_dmac axi_ad9371_tx_dma ad_ip_parameter axi_ad9371_tx_dma CONFIG.DMA_TYPE_SRC 0 @@ -59,9 +61,11 @@ ad_ip_parameter axi_ad9371_rx_xcvr CONFIG.LPM_OR_DFE_N 1 adi_axi_jesd204_rx_create axi_ad9371_rx_jesd 2 -ad_ip_instance util_cpack util_ad9371_rx_cpack -ad_ip_parameter util_ad9371_rx_cpack CONFIG.CHANNEL_DATA_WIDTH 16 -ad_ip_parameter util_ad9371_rx_cpack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_instance util_cpack2 util_ad9371_rx_cpack { \ + NUM_OF_CHANNELS 4 \ + SAMPLES_PER_CHANNEL 1 \ + SAMPLE_DATA_WIDTH 16 \ +} ad_ip_instance axi_dmac axi_ad9371_rx_dma ad_ip_parameter axi_ad9371_rx_dma CONFIG.DMA_TYPE_SRC 2 @@ -95,9 +99,11 @@ ad_ip_parameter axi_ad9371_rx_os_xcvr CONFIG.LPM_OR_DFE_N 1 adi_axi_jesd204_rx_create axi_ad9371_rx_os_jesd 2 -ad_ip_instance util_cpack util_ad9371_rx_os_cpack -ad_ip_parameter util_ad9371_rx_os_cpack CONFIG.CHANNEL_DATA_WIDTH 32 -ad_ip_parameter util_ad9371_rx_os_cpack CONFIG.NUM_OF_CHANNELS 2 +ad_ip_instance util_cpack2 util_ad9371_rx_os_cpack { \ + NUM_OF_CHANNELS 2 \ + SAMPLES_PER_CHANNEL 2 \ + SAMPLE_DATA_WIDTH 16 \ +} ad_ip_instance axi_dmac axi_ad9371_rx_os_dma ad_ip_parameter axi_ad9371_rx_os_dma CONFIG.DMA_TYPE_SRC 2 @@ -185,23 +191,27 @@ ad_connect sys_dma_reset axi_ad9371_dacfifo/dma_rst ad_connect axi_ad9371_tx_clkgen/clk_0 axi_ad9371_core/dac_clk ad_connect axi_ad9371_tx_jesd/tx_data_tdata axi_ad9371_core/dac_tx_data -ad_connect axi_ad9371_tx_clkgen/clk_0 util_ad9371_tx_upack/dac_clk -ad_connect axi_ad9371_core/dac_valid_i0 util_ad9371_tx_upack/dac_valid_0 -ad_connect axi_ad9371_core/dac_enable_i0 util_ad9371_tx_upack/dac_enable_0 -ad_connect axi_ad9371_core/dac_data_i0 util_ad9371_tx_upack/dac_data_0 -ad_connect axi_ad9371_core/dac_valid_q0 util_ad9371_tx_upack/dac_valid_1 -ad_connect axi_ad9371_core/dac_enable_q0 util_ad9371_tx_upack/dac_enable_1 -ad_connect axi_ad9371_core/dac_data_q0 util_ad9371_tx_upack/dac_data_1 -ad_connect axi_ad9371_core/dac_valid_i1 util_ad9371_tx_upack/dac_valid_2 -ad_connect axi_ad9371_core/dac_enable_i1 util_ad9371_tx_upack/dac_enable_2 -ad_connect axi_ad9371_core/dac_data_i1 util_ad9371_tx_upack/dac_data_2 -ad_connect axi_ad9371_core/dac_valid_q1 util_ad9371_tx_upack/dac_valid_3 -ad_connect axi_ad9371_core/dac_enable_q1 util_ad9371_tx_upack/dac_enable_3 -ad_connect axi_ad9371_core/dac_data_q1 util_ad9371_tx_upack/dac_data_3 +ad_connect axi_ad9371_tx_clkgen/clk_0 util_ad9371_tx_upack/clk +ad_connect axi_ad9371_tx_jesd_rstgen/peripheral_reset util_ad9371_tx_upack/reset + +ad_connect axi_ad9371_core/dac_valid_i0 util_ad9371_tx_upack/fifo_rd_en +ad_connect axi_ad9371_core/dac_enable_i0 util_ad9371_tx_upack/enable_0 +ad_connect axi_ad9371_core/dac_data_i0 util_ad9371_tx_upack/fifo_rd_data_0 +ad_connect axi_ad9371_core/dac_enable_q0 util_ad9371_tx_upack/enable_1 +ad_connect axi_ad9371_core/dac_data_q0 util_ad9371_tx_upack/fifo_rd_data_1 +ad_connect axi_ad9371_core/dac_enable_i1 util_ad9371_tx_upack/enable_2 +ad_connect axi_ad9371_core/dac_data_i1 util_ad9371_tx_upack/fifo_rd_data_2 +ad_connect axi_ad9371_core/dac_enable_q1 util_ad9371_tx_upack/enable_3 +ad_connect axi_ad9371_core/dac_data_q1 util_ad9371_tx_upack/fifo_rd_data_3 + ad_connect axi_ad9371_tx_clkgen/clk_0 axi_ad9371_dacfifo/dac_clk ad_connect axi_ad9371_tx_jesd_rstgen/peripheral_reset axi_ad9371_dacfifo/dac_rst -ad_connect util_ad9371_tx_upack/dac_valid axi_ad9371_dacfifo/dac_valid -ad_connect util_ad9371_tx_upack/dac_data axi_ad9371_dacfifo/dac_data + +# TODO: Add streaming AXI interface for DAC FIFO +ad_connect util_ad9371_tx_upack/s_axis_valid VCC +ad_connect util_ad9371_tx_upack/s_axis_ready axi_ad9371_dacfifo/dac_valid +ad_connect util_ad9371_tx_upack/s_axis_data axi_ad9371_dacfifo/dac_data + ad_connect sys_dma_clk axi_ad9371_dacfifo/dma_clk ad_connect sys_dma_clk axi_ad9371_tx_dma/m_axis_aclk ad_connect axi_ad9371_dacfifo/dma_valid axi_ad9371_tx_dma/m_axis_valid @@ -218,25 +228,22 @@ ad_connect sys_dma_resetn axi_ad9371_tx_dma/m_src_axi_aresetn ad_connect axi_ad9371_rx_clkgen/clk_0 axi_ad9371_core/adc_clk ad_connect axi_ad9371_rx_jesd/rx_sof axi_ad9371_core/adc_rx_sof ad_connect axi_ad9371_rx_jesd/rx_data_tdata axi_ad9371_core/adc_rx_data -ad_connect axi_ad9371_rx_clkgen/clk_0 util_ad9371_rx_cpack/adc_clk -ad_connect axi_ad9371_rx_jesd_rstgen/peripheral_reset util_ad9371_rx_cpack/adc_rst -ad_connect axi_ad9371_core/adc_enable_i0 util_ad9371_rx_cpack/adc_enable_0 -ad_connect axi_ad9371_core/adc_valid_i0 util_ad9371_rx_cpack/adc_valid_0 -ad_connect axi_ad9371_core/adc_data_i0 util_ad9371_rx_cpack/adc_data_0 -ad_connect axi_ad9371_core/adc_enable_q0 util_ad9371_rx_cpack/adc_enable_1 -ad_connect axi_ad9371_core/adc_valid_q0 util_ad9371_rx_cpack/adc_valid_1 -ad_connect axi_ad9371_core/adc_data_q0 util_ad9371_rx_cpack/adc_data_1 -ad_connect axi_ad9371_core/adc_enable_i1 util_ad9371_rx_cpack/adc_enable_2 -ad_connect axi_ad9371_core/adc_valid_i1 util_ad9371_rx_cpack/adc_valid_2 -ad_connect axi_ad9371_core/adc_data_i1 util_ad9371_rx_cpack/adc_data_2 -ad_connect axi_ad9371_core/adc_enable_q1 util_ad9371_rx_cpack/adc_enable_3 -ad_connect axi_ad9371_core/adc_valid_q1 util_ad9371_rx_cpack/adc_valid_3 -ad_connect axi_ad9371_core/adc_data_q1 util_ad9371_rx_cpack/adc_data_3 +ad_connect axi_ad9371_rx_clkgen/clk_0 util_ad9371_rx_cpack/clk +ad_connect axi_ad9371_rx_jesd_rstgen/peripheral_reset util_ad9371_rx_cpack/reset + +ad_connect axi_ad9371_core/adc_valid_i0 util_ad9371_rx_cpack/fifo_wr_en +ad_connect axi_ad9371_core/adc_enable_i0 util_ad9371_rx_cpack/enable_0 +ad_connect axi_ad9371_core/adc_data_i0 util_ad9371_rx_cpack/fifo_wr_data_0 +ad_connect axi_ad9371_core/adc_enable_q0 util_ad9371_rx_cpack/enable_1 +ad_connect axi_ad9371_core/adc_data_q0 util_ad9371_rx_cpack/fifo_wr_data_1 +ad_connect axi_ad9371_core/adc_enable_i1 util_ad9371_rx_cpack/enable_2 +ad_connect axi_ad9371_core/adc_data_i1 util_ad9371_rx_cpack/fifo_wr_data_2 +ad_connect axi_ad9371_core/adc_enable_q1 util_ad9371_rx_cpack/enable_3 +ad_connect axi_ad9371_core/adc_data_q1 util_ad9371_rx_cpack/fifo_wr_data_3 +ad_connect axi_ad9371_core/adc_dovf util_ad9371_rx_cpack/fifo_wr_overflow + ad_connect axi_ad9371_rx_clkgen/clk_0 axi_ad9371_rx_dma/fifo_wr_clk -ad_connect util_ad9371_rx_cpack/adc_valid axi_ad9371_rx_dma/fifo_wr_en -ad_connect util_ad9371_rx_cpack/adc_sync axi_ad9371_rx_dma/fifo_wr_sync -ad_connect util_ad9371_rx_cpack/adc_data axi_ad9371_rx_dma/fifo_wr_din -ad_connect axi_ad9371_rx_dma/fifo_wr_overflow axi_ad9371_core/adc_dovf +ad_connect util_ad9371_rx_cpack/packed_fifo_wr axi_ad9371_rx_dma/fifo_wr ad_connect sys_dma_resetn axi_ad9371_rx_dma/m_dest_axi_aresetn # connections (adc-os) @@ -244,19 +251,18 @@ ad_connect sys_dma_resetn axi_ad9371_rx_dma/m_dest_axi_aresetn ad_connect axi_ad9371_rx_os_clkgen/clk_0 axi_ad9371_core/adc_os_clk ad_connect axi_ad9371_rx_os_jesd/rx_sof axi_ad9371_core/adc_rx_os_sof ad_connect axi_ad9371_rx_os_jesd/rx_data_tdata axi_ad9371_core/adc_rx_os_data -ad_connect axi_ad9371_rx_os_clkgen/clk_0 util_ad9371_rx_os_cpack/adc_clk -ad_connect axi_ad9371_rx_os_jesd_rstgen/peripheral_reset util_ad9371_rx_os_cpack/adc_rst -ad_connect axi_ad9371_core/adc_os_enable_i0 util_ad9371_rx_os_cpack/adc_enable_0 -ad_connect axi_ad9371_core/adc_os_valid_i0 util_ad9371_rx_os_cpack/adc_valid_0 -ad_connect axi_ad9371_core/adc_os_data_i0 util_ad9371_rx_os_cpack/adc_data_0 -ad_connect axi_ad9371_core/adc_os_enable_q0 util_ad9371_rx_os_cpack/adc_enable_1 -ad_connect axi_ad9371_core/adc_os_valid_q0 util_ad9371_rx_os_cpack/adc_valid_1 -ad_connect axi_ad9371_core/adc_os_data_q0 util_ad9371_rx_os_cpack/adc_data_1 +ad_connect axi_ad9371_rx_os_clkgen/clk_0 util_ad9371_rx_os_cpack/clk +ad_connect axi_ad9371_rx_os_jesd_rstgen/peripheral_reset util_ad9371_rx_os_cpack/reset + +ad_connect axi_ad9371_core/adc_os_valid_i0 util_ad9371_rx_os_cpack/fifo_wr_en +ad_connect axi_ad9371_core/adc_os_enable_i0 util_ad9371_rx_os_cpack/enable_0 +ad_connect axi_ad9371_core/adc_os_data_i0 util_ad9371_rx_os_cpack/fifo_wr_data_0 +ad_connect axi_ad9371_core/adc_os_enable_q0 util_ad9371_rx_os_cpack/enable_1 +ad_connect axi_ad9371_core/adc_os_data_q0 util_ad9371_rx_os_cpack/fifo_wr_data_1 +ad_connect axi_ad9371_core/adc_os_dovf util_ad9371_rx_os_cpack/fifo_wr_overflow + ad_connect axi_ad9371_rx_os_clkgen/clk_0 axi_ad9371_rx_os_dma/fifo_wr_clk -ad_connect util_ad9371_rx_os_cpack/adc_valid axi_ad9371_rx_os_dma/fifo_wr_en -ad_connect util_ad9371_rx_os_cpack/adc_sync axi_ad9371_rx_os_dma/fifo_wr_sync -ad_connect util_ad9371_rx_os_cpack/adc_data axi_ad9371_rx_os_dma/fifo_wr_din -ad_connect axi_ad9371_rx_os_dma/fifo_wr_overflow axi_ad9371_core/adc_os_dovf +ad_connect util_ad9371_rx_os_cpack/packed_fifo_wr axi_ad9371_rx_os_dma/fifo_wr ad_connect sys_dma_resetn axi_ad9371_rx_os_dma/m_dest_axi_aresetn # interconnect (cpu) diff --git a/projects/adrv9371x/common/adrv9371x_qsys.tcl b/projects/adrv9371x/common/adrv9371x_qsys.tcl index b7953cbd8..6ad377050 100644 --- a/projects/adrv9371x/common/adrv9371x_qsys.tcl +++ b/projects/adrv9371x/common/adrv9371x_qsys.tcl @@ -79,32 +79,40 @@ add_connection sys_clk.clk_reset axi_ad9371.s_axi_reset # pack(s) & unpack(s) -add_instance axi_ad9371_tx_upack util_upack +add_instance axi_ad9371_tx_upack util_upack2 set_instance_parameter_value axi_ad9371_tx_upack {NUM_OF_CHANNELS} {4} -set_instance_parameter_value axi_ad9371_tx_upack {CHANNEL_DATA_WIDTH} {32} -add_connection ad9371_tx_jesd204.link_clk axi_ad9371_tx_upack.if_dac_clk +set_instance_parameter_value axi_ad9371_tx_upack {SAMPLES_PER_CHANNEL} {2} +set_instance_parameter_value axi_ad9371_tx_upack {SAMPLE_DATA_WIDTH} {16} +set_instance_parameter_value axi_ad9371_tx_upack {INTERFACE_TYPE} {1} + +add_connection ad9371_tx_jesd204.link_clk axi_ad9371_tx_upack.clk +add_connection ad9371_tx_jesd204.link_reset axi_ad9371_tx_upack.reset add_connection axi_ad9371_tx_upack.dac_ch_0 axi_ad9371.dac_ch_0 add_connection axi_ad9371_tx_upack.dac_ch_1 axi_ad9371.dac_ch_1 add_connection axi_ad9371_tx_upack.dac_ch_2 axi_ad9371.dac_ch_2 add_connection axi_ad9371_tx_upack.dac_ch_3 axi_ad9371.dac_ch_3 -add_instance axi_ad9371_rx_cpack util_cpack +add_instance axi_ad9371_rx_cpack util_cpack2 set_instance_parameter_value axi_ad9371_rx_cpack {NUM_OF_CHANNELS} {4} -set_instance_parameter_value axi_ad9371_rx_cpack {CHANNEL_DATA_WIDTH} {16} -add_connection sys_clk.clk_reset axi_ad9371_rx_cpack.if_adc_rst -add_connection ad9371_rx_jesd204.link_clk axi_ad9371_rx_cpack.if_adc_clk +set_instance_parameter_value axi_ad9371_rx_cpack {SAMPLES_PER_CHANNEL} {1} +set_instance_parameter_value axi_ad9371_rx_cpack {SAMPLE_DATA_WIDTH} {16} +add_connection ad9371_rx_jesd204.link_clk axi_ad9371_rx_cpack.clk +add_connection ad9371_rx_jesd204.link_reset axi_ad9371_rx_cpack.reset add_connection axi_ad9371.adc_ch_0 axi_ad9371_rx_cpack.adc_ch_0 add_connection axi_ad9371.adc_ch_1 axi_ad9371_rx_cpack.adc_ch_1 add_connection axi_ad9371.adc_ch_2 axi_ad9371_rx_cpack.adc_ch_2 add_connection axi_ad9371.adc_ch_3 axi_ad9371_rx_cpack.adc_ch_3 +add_connection axi_ad9371_rx_cpack.if_fifo_wr_overflow axi_ad9371.if_adc_dovf -add_instance axi_ad9371_rx_os_cpack util_cpack +add_instance axi_ad9371_rx_os_cpack util_cpack2 set_instance_parameter_value axi_ad9371_rx_os_cpack {NUM_OF_CHANNELS} {2} -set_instance_parameter_value axi_ad9371_rx_os_cpack {CHANNEL_DATA_WIDTH} {32} -add_connection sys_clk.clk_reset axi_ad9371_rx_os_cpack.if_adc_rst -add_connection ad9371_rx_os_jesd204.link_clk axi_ad9371_rx_os_cpack.if_adc_clk +set_instance_parameter_value axi_ad9371_rx_os_cpack {SAMPLES_PER_CHANNEL} {2} +set_instance_parameter_value axi_ad9371_rx_os_cpack {SAMPLE_DATA_WIDTH} {16} +add_connection ad9371_rx_os_jesd204.link_clk axi_ad9371_rx_os_cpack.clk +add_connection ad9371_rx_os_jesd204.link_reset axi_ad9371_rx_os_cpack.reset add_connection axi_ad9371.adc_os_ch_0 axi_ad9371_rx_os_cpack.adc_ch_0 add_connection axi_ad9371.adc_os_ch_1 axi_ad9371_rx_os_cpack.adc_ch_1 +add_connection axi_ad9371_rx_os_cpack.if_fifo_wr_overflow axi_ad9371.if_adc_os_dovf # dac fifo @@ -113,8 +121,8 @@ set_interface_property tx_fifo_bypass EXPORT_OF avl_ad9371_tx_fifo.if_bypass add_connection ad9371_tx_jesd204.link_clk avl_ad9371_tx_fifo.if_dac_clk add_connection ad9371_tx_jesd204.link_reset avl_ad9371_tx_fifo.if_dac_rst -add_connection axi_ad9371_tx_upack.if_dac_valid avl_ad9371_tx_fifo.if_dac_valid -add_connection avl_ad9371_tx_fifo.if_dac_data axi_ad9371_tx_upack.if_dac_data +add_connection axi_ad9371_tx_upack.if_packed_fifo_rd_en avl_ad9371_tx_fifo.if_dac_valid +add_connection avl_ad9371_tx_fifo.if_dac_data axi_ad9371_tx_upack.if_packed_fifo_rd_data add_connection avl_ad9371_tx_fifo.if_dac_dunf axi_ad9371.if_dac_dunf # dac & adc dma @@ -160,10 +168,10 @@ set_instance_parameter_value axi_ad9371_rx_dma {DMA_TYPE_DEST} {0} set_instance_parameter_value axi_ad9371_rx_dma {DMA_TYPE_SRC} {2} set_instance_parameter_value axi_ad9371_rx_dma {FIFO_SIZE} {16} add_connection ad9371_rx_jesd204.link_clk axi_ad9371_rx_dma.if_fifo_wr_clk -add_connection axi_ad9371_rx_cpack.if_adc_valid axi_ad9371_rx_dma.if_fifo_wr_en -add_connection axi_ad9371_rx_cpack.if_adc_sync axi_ad9371_rx_dma.if_fifo_wr_sync -add_connection axi_ad9371_rx_cpack.if_adc_data axi_ad9371_rx_dma.if_fifo_wr_din -add_connection axi_ad9371_rx_dma.if_fifo_wr_overflow axi_ad9371.if_adc_dovf +add_connection axi_ad9371_rx_cpack.if_packed_fifo_wr_en axi_ad9371_rx_dma.if_fifo_wr_en +add_connection axi_ad9371_rx_cpack.if_packed_fifo_wr_sync axi_ad9371_rx_dma.if_fifo_wr_sync +add_connection axi_ad9371_rx_cpack.if_packed_fifo_wr_data axi_ad9371_rx_dma.if_fifo_wr_din +add_connection axi_ad9371_rx_dma.if_fifo_wr_overflow axi_ad9371_rx_cpack.if_packed_fifo_wr_overflow add_connection sys_clk.clk axi_ad9371_rx_dma.s_axi_clock add_connection sys_clk.clk_reset axi_ad9371_rx_dma.s_axi_reset add_connection sys_dma_clk.clk axi_ad9371_rx_dma.m_dest_axi_clock @@ -183,10 +191,10 @@ set_instance_parameter_value axi_ad9371_rx_os_dma {DMA_TYPE_DEST} {0} set_instance_parameter_value axi_ad9371_rx_os_dma {DMA_TYPE_SRC} {2} set_instance_parameter_value axi_ad9371_rx_os_dma {FIFO_SIZE} {16} add_connection ad9371_rx_os_jesd204.link_clk axi_ad9371_rx_os_dma.if_fifo_wr_clk -add_connection axi_ad9371_rx_os_cpack.if_adc_valid axi_ad9371_rx_os_dma.if_fifo_wr_en -add_connection axi_ad9371_rx_os_cpack.if_adc_sync axi_ad9371_rx_os_dma.if_fifo_wr_sync -add_connection axi_ad9371_rx_os_cpack.if_adc_data axi_ad9371_rx_os_dma.if_fifo_wr_din -add_connection axi_ad9371_rx_os_dma.if_fifo_wr_overflow axi_ad9371.if_adc_os_dovf +add_connection axi_ad9371_rx_os_cpack.if_packed_fifo_wr_en axi_ad9371_rx_os_dma.if_fifo_wr_en +add_connection axi_ad9371_rx_os_cpack.if_packed_fifo_wr_sync axi_ad9371_rx_os_dma.if_fifo_wr_sync +add_connection axi_ad9371_rx_os_cpack.if_packed_fifo_wr_data axi_ad9371_rx_os_dma.if_fifo_wr_din +add_connection axi_ad9371_rx_os_dma.if_fifo_wr_overflow axi_ad9371_rx_os_cpack.if_packed_fifo_wr_overflow add_connection sys_clk.clk axi_ad9371_rx_os_dma.s_axi_clock add_connection sys_clk.clk_reset axi_ad9371_rx_os_dma.s_axi_reset add_connection sys_dma_clk.clk axi_ad9371_rx_os_dma.m_dest_axi_clock diff --git a/projects/adrv9371x/kcu105/Makefile b/projects/adrv9371x/kcu105/Makefile index 80408fe7a..95a6d0b90 100644 --- a/projects/adrv9371x/kcu105/Makefile +++ b/projects/adrv9371x/kcu105/Makefile @@ -21,9 +21,9 @@ LIB_DEPS += jesd204/axi_jesd204_rx LIB_DEPS += jesd204/axi_jesd204_tx LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += jesd204/jesd204_tx -LIB_DEPS += util_cpack LIB_DEPS += util_dacfifo -LIB_DEPS += util_upack +LIB_DEPS += util_pack/util_cpack2 +LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr diff --git a/projects/adrv9371x/zc706/Makefile b/projects/adrv9371x/zc706/Makefile index d622914be..95a814539 100644 --- a/projects/adrv9371x/zc706/Makefile +++ b/projects/adrv9371x/zc706/Makefile @@ -22,8 +22,8 @@ LIB_DEPS += jesd204/axi_jesd204_rx LIB_DEPS += jesd204/axi_jesd204_tx LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += jesd204/jesd204_tx -LIB_DEPS += util_cpack -LIB_DEPS += util_upack +LIB_DEPS += util_pack/util_cpack2 +LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/axi_dacfifo LIB_DEPS += xilinx/util_adxcvr diff --git a/projects/adrv9371x/zcu102/Makefile b/projects/adrv9371x/zcu102/Makefile index ee31ccac8..eb6b94939 100644 --- a/projects/adrv9371x/zcu102/Makefile +++ b/projects/adrv9371x/zcu102/Makefile @@ -19,9 +19,9 @@ LIB_DEPS += jesd204/axi_jesd204_rx LIB_DEPS += jesd204/axi_jesd204_tx LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += jesd204/jesd204_tx -LIB_DEPS += util_cpack LIB_DEPS += util_dacfifo -LIB_DEPS += util_upack +LIB_DEPS += util_pack/util_cpack2 +LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr