From 6ef268bb31ff02d7a576ae2503f49a9fdb6091e9 Mon Sep 17 00:00:00 2001 From: AndreiGrozav Date: Wed, 16 May 2018 16:56:12 +0300 Subject: [PATCH] common/zc706: Replace VDMA with ADI DMAC --- projects/adv7511/zc706/Makefile | 1 + projects/common/zc706/zc706_system_bd.tcl | 33 ++++++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/projects/adv7511/zc706/Makefile b/projects/adv7511/zc706/Makefile index 8e08388d1..4f1eab348 100644 --- a/projects/adv7511/zc706/Makefile +++ b/projects/adv7511/zc706/Makefile @@ -10,6 +10,7 @@ M_DEPS += ../../common/zc706/zc706_system_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v LIB_DEPS += axi_clkgen +LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx diff --git a/projects/common/zc706/zc706_system_bd.tcl b/projects/common/zc706/zc706_system_bd.tcl index 86ad17703..24fc3f5af 100644 --- a/projects/common/zc706/zc706_system_bd.tcl +++ b/projects/common/zc706/zc706_system_bd.tcl @@ -79,10 +79,15 @@ ad_ip_instance axi_clkgen axi_hdmi_clkgen ad_ip_instance axi_hdmi_tx axi_hdmi_core ad_ip_parameter axi_hdmi_core CONFIG.INTERFACE 24_BIT -ad_ip_instance axi_vdma axi_hdmi_dma -ad_ip_parameter axi_hdmi_dma CONFIG.C_M_AXIS_MM2S_TDATA_WIDTH 64 -ad_ip_parameter axi_hdmi_dma CONFIG.C_USE_MM2S_FSYNC 1 -ad_ip_parameter axi_hdmi_dma CONFIG.C_INCLUDE_S2MM 0 +ad_ip_instance axi_dmac axi_hdmi_dma +ad_ip_parameter axi_hdmi_dma CONFIG.DMA_TYPE_SRC 0 +ad_ip_parameter axi_hdmi_dma CONFIG.DMA_TYPE_DEST 1 +ad_ip_parameter axi_hdmi_dma CONFIG.CYCLIC true +ad_ip_parameter axi_hdmi_dma CONFIG.SYNC_TRANSFER_START 0 +ad_ip_parameter axi_hdmi_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_hdmi_dma CONFIG.AXI_SLICE_DEST 0 +ad_ip_parameter axi_hdmi_dma CONFIG.DMA_2D_TRANSFER true +ad_ip_parameter axi_hdmi_dma CONFIG.DMA_DATA_WIDTH_SRC 64 # audio peripherals @@ -142,18 +147,22 @@ ad_connect spi1_sdi_i sys_ps7/SPI1_MISO_I # hdmi ad_connect sys_cpu_clk axi_hdmi_core/vdma_clk -ad_connect sys_cpu_clk axi_hdmi_dma/m_axis_mm2s_aclk ad_connect axi_hdmi_core/hdmi_clk axi_hdmi_clkgen/clk_0 ad_connect axi_hdmi_core/hdmi_out_clk hdmi_out_clk ad_connect axi_hdmi_core/hdmi_24_hsync hdmi_hsync ad_connect axi_hdmi_core/hdmi_24_vsync hdmi_vsync ad_connect axi_hdmi_core/hdmi_24_data_e hdmi_data_e ad_connect axi_hdmi_core/hdmi_24_data hdmi_data -ad_connect axi_hdmi_core/vdma_valid axi_hdmi_dma/m_axis_mm2s_tvalid -ad_connect axi_hdmi_core/vdma_data axi_hdmi_dma/m_axis_mm2s_tdata -ad_connect axi_hdmi_core/vdma_ready axi_hdmi_dma/m_axis_mm2s_tready -ad_connect axi_hdmi_core/vdma_fs axi_hdmi_dma/mm2s_fsync -ad_connect axi_hdmi_core/vdma_fs axi_hdmi_core/vdma_fs_ret + +ad_connect axi_hdmi_core/vdma_valid axi_hdmi_dma/m_axis_valid +ad_connect axi_hdmi_core/vdma_data axi_hdmi_dma/m_axis_data +ad_connect axi_hdmi_core/vdma_ready axi_hdmi_dma/m_axis_ready +ad_connect axi_hdmi_core/vdma_end_of_frame axi_hdmi_dma/m_axis_last +ad_connect sys_cpu_resetn axi_hdmi_dma/s_axi_aresetn +ad_connect sys_cpu_resetn axi_hdmi_dma/m_src_axi_aresetn +ad_connect sys_cpu_clk axi_hdmi_dma/s_axi_aclk +ad_connect sys_cpu_clk axi_hdmi_dma/m_src_axi_aclk +ad_connect sys_cpu_clk axi_hdmi_dma/m_axis_aclk # spdif audio @@ -170,7 +179,7 @@ ad_connect spdif axi_spdif_tx_core/spdif_tx_o # interrupts ad_connect sys_concat_intc/dout sys_ps7/IRQ_F2P -ad_connect sys_concat_intc/In15 axi_hdmi_dma/mm2s_introut +ad_connect sys_concat_intc/In15 axi_hdmi_dma/irq ad_connect sys_concat_intc/In14 axi_iic_main/iic2intc_irpt ad_connect sys_concat_intc/In13 GND ad_connect sys_concat_intc/In12 GND @@ -195,5 +204,5 @@ ad_cpu_interconnect 0x43000000 axi_hdmi_dma ad_cpu_interconnect 0x70e00000 axi_hdmi_core ad_cpu_interconnect 0x75c00000 axi_spdif_tx_core ad_mem_hp0_interconnect sys_cpu_clk sys_ps7/S_AXI_HP0 -ad_mem_hp0_interconnect sys_cpu_clk axi_hdmi_dma/M_AXI_MM2S +ad_mem_hp0_interconnect sys_cpu_clk axi_hdmi_dma/m_src_axi