adrv9009: Move intel project to upack2/cpack2

main
Adrian Costina 2018-11-29 14:03:59 +00:00
parent 804c57aabc
commit e09f3290ff
3 changed files with 32 additions and 25 deletions

View File

@ -13,8 +13,8 @@ M_DEPS += ../../common/a10gx/a10gx_system_assign.tcl
LIB_DEPS += altera/adi_jesd204 LIB_DEPS += altera/adi_jesd204
LIB_DEPS += axi_adrv9009 LIB_DEPS += axi_adrv9009
LIB_DEPS += axi_dmac LIB_DEPS += axi_dmac
LIB_DEPS += util_cpack
LIB_DEPS += util_dacfifo 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 include ../../scripts/project-altera.mk

View File

@ -15,7 +15,7 @@ LIB_DEPS += altera/adi_jesd204
LIB_DEPS += altera/avl_dacfifo LIB_DEPS += altera/avl_dacfifo
LIB_DEPS += axi_adrv9009 LIB_DEPS += axi_adrv9009
LIB_DEPS += axi_dmac LIB_DEPS += axi_dmac
LIB_DEPS += util_cpack LIB_DEPS += util_pack/util_cpack2
LIB_DEPS += util_upack LIB_DEPS += util_pack/util_upack2
include ../../scripts/project-altera.mk include ../../scripts/project-altera.mk

View File

@ -79,34 +79,41 @@ add_connection sys_clk.clk_reset axi_adrv9009.s_axi_reset
# pack(s) & unpack(s) # pack(s) & unpack(s)
add_instance axi_adrv9009_tx_upack util_upack add_instance axi_adrv9009_tx_upack util_upack2
set_instance_parameter_value axi_adrv9009_tx_upack {NUM_OF_CHANNELS} {4} set_instance_parameter_value axi_adrv9009_tx_upack {NUM_OF_CHANNELS} {4}
set_instance_parameter_value axi_adrv9009_tx_upack {CHANNEL_DATA_WIDTH} {32} set_instance_parameter_value axi_adrv9009_tx_upack {SAMPLES_PER_CHANNEL} {2}
add_connection adrv9009_tx_jesd204.link_clk axi_adrv9009_tx_upack.if_dac_clk set_instance_parameter_value axi_adrv9009_tx_upack {SAMPLE_DATA_WIDTH} {16}
set_instance_parameter_value axi_adrv9009_tx_upack {INTERFACE_TYPE} {1}
add_connection adrv9009_tx_jesd204.link_clk axi_adrv9009_tx_upack.clk
add_connection adrv9009_tx_jesd204.link_reset axi_adrv9009_tx_upack.reset
add_connection axi_adrv9009_tx_upack.dac_ch_0 axi_adrv9009.dac_ch_0 add_connection axi_adrv9009_tx_upack.dac_ch_0 axi_adrv9009.dac_ch_0
add_connection axi_adrv9009_tx_upack.dac_ch_1 axi_adrv9009.dac_ch_1 add_connection axi_adrv9009_tx_upack.dac_ch_1 axi_adrv9009.dac_ch_1
add_connection axi_adrv9009_tx_upack.dac_ch_2 axi_adrv9009.dac_ch_2 add_connection axi_adrv9009_tx_upack.dac_ch_2 axi_adrv9009.dac_ch_2
add_connection axi_adrv9009_tx_upack.dac_ch_3 axi_adrv9009.dac_ch_3 add_connection axi_adrv9009_tx_upack.dac_ch_3 axi_adrv9009.dac_ch_3
add_instance axi_adrv9009_rx_cpack util_cpack add_instance axi_adrv9009_rx_cpack util_cpack2
set_instance_parameter_value axi_adrv9009_rx_cpack {NUM_OF_CHANNELS} {4} set_instance_parameter_value axi_adrv9009_rx_cpack {NUM_OF_CHANNELS} {4}
set_instance_parameter_value axi_adrv9009_rx_cpack {CHANNEL_DATA_WIDTH} {16} set_instance_parameter_value axi_adrv9009_rx_cpack {SAMPLES_PER_CHANNEL} {1}
add_connection sys_clk.clk_reset axi_adrv9009_rx_cpack.if_adc_rst set_instance_parameter_value axi_adrv9009_rx_cpack {SAMPLE_DATA_WIDTH} {16}
add_connection adrv9009_rx_jesd204.link_clk axi_adrv9009_rx_cpack.if_adc_clk add_connection adrv9009_rx_jesd204.link_reset axi_adrv9009_rx_cpack.reset
add_connection adrv9009_rx_jesd204.link_clk axi_adrv9009_rx_cpack.clk
add_connection axi_adrv9009.adc_ch_0 axi_adrv9009_rx_cpack.adc_ch_0 add_connection axi_adrv9009.adc_ch_0 axi_adrv9009_rx_cpack.adc_ch_0
add_connection axi_adrv9009.adc_ch_1 axi_adrv9009_rx_cpack.adc_ch_1 add_connection axi_adrv9009.adc_ch_1 axi_adrv9009_rx_cpack.adc_ch_1
add_connection axi_adrv9009.adc_ch_2 axi_adrv9009_rx_cpack.adc_ch_2 add_connection axi_adrv9009.adc_ch_2 axi_adrv9009_rx_cpack.adc_ch_2
add_connection axi_adrv9009.adc_ch_3 axi_adrv9009_rx_cpack.adc_ch_3 add_connection axi_adrv9009.adc_ch_3 axi_adrv9009_rx_cpack.adc_ch_3
add_connection axi_adrv9009_rx_cpack.if_fifo_wr_overflow axi_adrv9009.if_adc_dovf
add_instance axi_adrv9009_rx_os_cpack util_cpack add_instance axi_adrv9009_rx_os_cpack util_cpack2
set_instance_parameter_value axi_adrv9009_rx_os_cpack {NUM_OF_CHANNELS} {4} set_instance_parameter_value axi_adrv9009_rx_os_cpack {NUM_OF_CHANNELS} {4}
set_instance_parameter_value axi_adrv9009_rx_os_cpack {CHANNEL_DATA_WIDTH} {32} set_instance_parameter_value axi_adrv9009_rx_os_cpack {SAMPLES_PER_CHANNEL} {2}
add_connection sys_clk.clk_reset axi_adrv9009_rx_os_cpack.if_adc_rst set_instance_parameter_value axi_adrv9009_rx_os_cpack {SAMPLE_DATA_WIDTH} {16}
add_connection adrv9009_rx_os_jesd204.link_clk axi_adrv9009_rx_os_cpack.if_adc_clk add_connection adrv9009_rx_os_jesd204.link_reset axi_adrv9009_rx_os_cpack.reset
add_connection adrv9009_rx_os_jesd204.link_clk axi_adrv9009_rx_os_cpack.clk
add_connection axi_adrv9009.adc_os_ch_0 axi_adrv9009_rx_os_cpack.adc_ch_0 add_connection axi_adrv9009.adc_os_ch_0 axi_adrv9009_rx_os_cpack.adc_ch_0
add_connection axi_adrv9009.adc_os_ch_1 axi_adrv9009_rx_os_cpack.adc_ch_1 add_connection axi_adrv9009.adc_os_ch_1 axi_adrv9009_rx_os_cpack.adc_ch_1
add_connection axi_adrv9009.adc_os_ch_2 axi_adrv9009_rx_os_cpack.adc_ch_2 add_connection axi_adrv9009.adc_os_ch_2 axi_adrv9009_rx_os_cpack.adc_ch_2
add_connection axi_adrv9009.adc_os_ch_3 axi_adrv9009_rx_os_cpack.adc_ch_3 add_connection axi_adrv9009.adc_os_ch_3 axi_adrv9009_rx_os_cpack.adc_ch_3
add_connection axi_adrv9009_rx_os_cpack.if_fifo_wr_overflow axi_adrv9009.if_adc_os_dovf
# dac fifo # dac fifo
@ -115,8 +122,8 @@ set_interface_property tx_fifo_bypass EXPORT_OF avl_adrv9009_tx_fifo.if_bypass
add_connection adrv9009_tx_jesd204.link_clk avl_adrv9009_tx_fifo.if_dac_clk add_connection adrv9009_tx_jesd204.link_clk avl_adrv9009_tx_fifo.if_dac_clk
add_connection adrv9009_tx_jesd204.link_reset avl_adrv9009_tx_fifo.if_dac_rst add_connection adrv9009_tx_jesd204.link_reset avl_adrv9009_tx_fifo.if_dac_rst
add_connection axi_adrv9009_tx_upack.if_dac_valid avl_adrv9009_tx_fifo.if_dac_valid add_connection axi_adrv9009_tx_upack.if_packed_fifo_rd_en avl_adrv9009_tx_fifo.if_dac_valid
add_connection avl_adrv9009_tx_fifo.if_dac_data axi_adrv9009_tx_upack.if_dac_data add_connection avl_adrv9009_tx_fifo.if_dac_data axi_adrv9009_tx_upack.if_packed_fifo_rd_data
add_connection avl_adrv9009_tx_fifo.if_dac_dunf axi_adrv9009.if_dac_dunf add_connection avl_adrv9009_tx_fifo.if_dac_dunf axi_adrv9009.if_dac_dunf
# dac & adc dma # dac & adc dma
@ -163,10 +170,10 @@ set_instance_parameter_value axi_adrv9009_rx_dma {DMA_TYPE_DEST} {0}
set_instance_parameter_value axi_adrv9009_rx_dma {DMA_TYPE_SRC} {2} set_instance_parameter_value axi_adrv9009_rx_dma {DMA_TYPE_SRC} {2}
set_instance_parameter_value axi_adrv9009_rx_dma {FIFO_SIZE} {16} set_instance_parameter_value axi_adrv9009_rx_dma {FIFO_SIZE} {16}
add_connection adrv9009_rx_jesd204.link_clk axi_adrv9009_rx_dma.if_fifo_wr_clk add_connection adrv9009_rx_jesd204.link_clk axi_adrv9009_rx_dma.if_fifo_wr_clk
add_connection axi_adrv9009_rx_cpack.if_adc_valid axi_adrv9009_rx_dma.if_fifo_wr_en add_connection axi_adrv9009_rx_cpack.if_packed_fifo_wr_en axi_adrv9009_rx_dma.if_fifo_wr_en
add_connection axi_adrv9009_rx_cpack.if_adc_sync axi_adrv9009_rx_dma.if_fifo_wr_sync add_connection axi_adrv9009_rx_cpack.if_packed_fifo_wr_sync axi_adrv9009_rx_dma.if_fifo_wr_sync
add_connection axi_adrv9009_rx_cpack.if_adc_data axi_adrv9009_rx_dma.if_fifo_wr_din add_connection axi_adrv9009_rx_cpack.if_packed_fifo_wr_data axi_adrv9009_rx_dma.if_fifo_wr_din
add_connection axi_adrv9009_rx_dma.if_fifo_wr_overflow axi_adrv9009.if_adc_dovf add_connection axi_adrv9009_rx_dma.if_fifo_wr_overflow axi_adrv9009_rx_cpack.if_packed_fifo_wr_overflow
add_connection sys_clk.clk axi_adrv9009_rx_dma.s_axi_clock add_connection sys_clk.clk axi_adrv9009_rx_dma.s_axi_clock
add_connection sys_clk.clk_reset axi_adrv9009_rx_dma.s_axi_reset add_connection sys_clk.clk_reset axi_adrv9009_rx_dma.s_axi_reset
add_connection sys_dma_clk.clk axi_adrv9009_rx_dma.m_dest_axi_clock add_connection sys_dma_clk.clk axi_adrv9009_rx_dma.m_dest_axi_clock
@ -186,10 +193,10 @@ set_instance_parameter_value axi_adrv9009_rx_os_dma {DMA_TYPE_DEST} {0}
set_instance_parameter_value axi_adrv9009_rx_os_dma {DMA_TYPE_SRC} {2} set_instance_parameter_value axi_adrv9009_rx_os_dma {DMA_TYPE_SRC} {2}
set_instance_parameter_value axi_adrv9009_rx_os_dma {FIFO_SIZE} {16} set_instance_parameter_value axi_adrv9009_rx_os_dma {FIFO_SIZE} {16}
add_connection adrv9009_rx_os_jesd204.link_clk axi_adrv9009_rx_os_dma.if_fifo_wr_clk add_connection adrv9009_rx_os_jesd204.link_clk axi_adrv9009_rx_os_dma.if_fifo_wr_clk
add_connection axi_adrv9009_rx_os_cpack.if_adc_valid axi_adrv9009_rx_os_dma.if_fifo_wr_en add_connection axi_adrv9009_rx_os_cpack.if_packed_fifo_wr_en axi_adrv9009_rx_os_dma.if_fifo_wr_en
add_connection axi_adrv9009_rx_os_cpack.if_adc_sync axi_adrv9009_rx_os_dma.if_fifo_wr_sync add_connection axi_adrv9009_rx_os_cpack.if_packed_fifo_wr_sync axi_adrv9009_rx_os_dma.if_fifo_wr_sync
add_connection axi_adrv9009_rx_os_cpack.if_adc_data axi_adrv9009_rx_os_dma.if_fifo_wr_din add_connection axi_adrv9009_rx_os_cpack.if_packed_fifo_wr_data axi_adrv9009_rx_os_dma.if_fifo_wr_din
add_connection axi_adrv9009_rx_os_dma.if_fifo_wr_overflow axi_adrv9009.if_adc_os_dovf add_connection axi_adrv9009_rx_os_dma.if_fifo_wr_overflow axi_adrv9009_rx_os_cpack.if_packed_fifo_wr_overflow
add_connection sys_clk.clk axi_adrv9009_rx_os_dma.s_axi_clock add_connection sys_clk.clk axi_adrv9009_rx_os_dma.s_axi_clock
add_connection sys_clk.clk_reset axi_adrv9009_rx_os_dma.s_axi_reset add_connection sys_clk.clk_reset axi_adrv9009_rx_os_dma.s_axi_reset
add_connection sys_dma_clk.clk axi_adrv9009_rx_os_dma.m_dest_axi_clock add_connection sys_dma_clk.clk axi_adrv9009_rx_os_dma.m_dest_axi_clock