Istvan Csomortani b84afcdcd1 Merge branch 'master' into dev ... Conflicts: library/Makefile library/axi_ad6676/axi_ad6676_ip.tcl library/axi_ad9122/axi_ad9122_core.v library/axi_ad9122/axi_ad9122_ip.tcl library/axi_ad9144/axi_ad9144_ip.tcl library/axi_ad9152/axi_ad9152_ip.tcl library/axi_ad9234/axi_ad9234_ip.tcl library/axi_ad9250/axi_ad9250_hw.tcl library/axi_ad9250/axi_ad9250_ip.tcl library/axi_ad9361/axi_ad9361.v library/axi_ad9361/axi_ad9361_dev_if_alt.v library/axi_ad9361/axi_ad9361_ip.tcl library/axi_ad9361/axi_ad9361_rx_channel.v library/axi_ad9361/axi_ad9361_tdd.v library/axi_ad9361/axi_ad9361_tx_channel.v library/axi_ad9625/axi_ad9625_ip.tcl library/axi_ad9643/axi_ad9643_channel.v library/axi_ad9643/axi_ad9643_ip.tcl library/axi_ad9652/axi_ad9652_channel.v library/axi_ad9652/axi_ad9652_ip.tcl library/axi_ad9671/axi_ad9671_constr.xdc library/axi_ad9671/axi_ad9671_ip.tcl library/axi_ad9680/axi_ad9680_ip.tcl library/axi_ad9739a/axi_ad9739a_ip.tcl library/axi_dmac/axi_dmac_constr.sdc library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl library/axi_jesd_gt/axi_jesd_gt_constr.xdc library/axi_jesd_gt/axi_jesd_gt_ip.tcl library/axi_mc_speed/axi_mc_speed_constr.xdc library/common/ad_gt_channel_1.v library/common/ad_gt_common_1.v library/common/ad_gt_es.v library/common/ad_iqcor.v library/common/ad_jesd_align.v library/common/ad_rst.v library/common/altera/ad_xcvr_rx_rst.v library/common/up_adc_common.v library/common/up_axis_dma_rx.v library/common/up_axis_dma_tx.v library/common/up_clkgen.v library/common/up_clock_mon.v library/common/up_dac_common.v library/common/up_gt.v library/common/up_hdmi_tx.v library/common/up_tdd_cntrl.v library/common/up_xfer_cntrl.v library/common/up_xfer_status.v library/util_cpack/util_cpack.v library/util_cpack/util_cpack_ip.tcl library/util_dac_unpack/util_dac_unpack_hw.tcl library/util_jesd_align/util_jesd_align.v library/util_jesd_xmit/util_jesd_xmit.v library/util_upack/util_upack_ip.tcl library/util_wfifo/util_wfifo.v library/util_wfifo/util_wfifo_constr.xdc library/util_wfifo/util_wfifo_ip.tcl projects/arradio/c5soc/system_bd.qsys projects/common/vc707/vc707_system_bd.tcl projects/common/zc706/zc706_system_plddr3.tcl projects/daq2/a10gx/Makefile projects/daq2/a10gx/system_bd.qsys projects/daq3/common/daq3_bd.tcl projects/daq3/zc706/system_bd.tcl projects/fmcjesdadc1/a5gt/Makefile projects/fmcjesdadc1/a5gt/system_bd.qsys projects/fmcjesdadc1/a5gt/system_constr.sdc projects/fmcjesdadc1/a5gt/system_top.v projects/fmcjesdadc1/a5soc/system_bd.qsys projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl projects/fmcomms1/ac701/system_bd.tcl projects/fmcomms1/common/fmcomms1_bd.tcl projects/fmcomms1/kc705/system_bd.tcl projects/fmcomms1/vc707/system_bd.tcl projects/fmcomms1/zc702/system_bd.tcl projects/fmcomms1/zc702/system_top.v projects/fmcomms1/zc706/system_bd.tcl projects/fmcomms1/zc706/system_top.v projects/fmcomms1/zed/system_bd.tcl projects/fmcomms1/zed/system_top.v projects/fmcomms2/ac701/system_constr.xdc projects/fmcomms2/common/fmcomms2_bd.tcl projects/fmcomms2/kc705/system_constr.xdc projects/fmcomms2/kc705/system_top.v projects/fmcomms2/mitx045/system_top.v projects/fmcomms2/rfsom/system_constr.xdc projects/fmcomms2/rfsom/system_top.v projects/fmcomms2/vc707/system_top.v projects/fmcomms2/zc706/system_bd.tcl projects/fmcomms2/zc706/system_constr.xdc projects/fmcomms2/zc706/system_top.v projects/fmcomms2/zed/system_top.v projects/imageon/zc706/system_constr.xdc projects/motcon2_fmc/common/motcon2_fmc_bd.tcl projects/motcon2_fmc/zed/system_constr.xdc projects/motcon2_fmc/zed/system_top.v projects/usdrx1/a5gt/Makefile projects/usdrx1/a5gt/system_bd.qsys projects/usdrx1/common/usdrx1_bd.tcl Conflicts were resolved using 'Mine' (/dev).		2015-08-17 15:15:58 +03:00
..
2d_transfer.v	axi_dmac: Fix issues with non 64-bit AXI masters	2014-04-10 14:54:22 +02:00
Makefile	Makefile: Updated makefiles so that the project recipe does not depend on lib	2015-05-06 14:58:29 +03:00
address_generator.v	axi_dmac: Added fix to work with motor_control	2014-09-03 12:10:34 +03:00
axi_dmac.v	axi_dmac: Move the 'axis_xlast' logic into the dest_axi_stream module	2015-05-06 16:10:28 +03:00
axi_dmac_constr.sdc	axi_dmac: Removed unneded constraints, as FMCJESDADC1 doesn't work correctly with them	2015-07-23 17:01:02 +03:00
axi_dmac_constr.xdc	axi_dmac: Updated constraints to cover cases when the hierarchy is rebuilt by synthesis	2015-05-13 16:34:06 +03:00
axi_dmac_hw.tcl	Merge branch 'master' into dev	2015-08-17 15:15:58 +03:00
axi_dmac_ip.tcl	Add .gitattributes file	2015-07-01 18:43:51 +02:00
axi_register_slice.v	axi_dmac: axi_register_slice: Provide default values for registers	2014-04-10 13:50:39 +02:00
data_mover.v	axi_damc: Add xfer_req to the FIFO source interface	2014-07-02 16:05:16 +02:00
dest_axi_mm.v	axi_dmac: Fix issues with non 64-bit AXI masters	2014-04-10 14:54:22 +02:00
dest_axi_stream.v	axi_dmac: Move the 'axis_xlast' logic into the dest_axi_stream module	2015-05-06 16:10:28 +03:00
dest_fifo_inf.v	axi_dmac: Brought up the transfer request signal for the dest_fifo and dest_axi_stream interface.	2015-03-26 12:20:32 +02:00
inc_id.h	Added axi_dmac, axi_fifo and misc files in library	2014-03-06 18:16:02 +02:00
request_arb.v	axi_dmac: Move the 'axis_xlast' logic into the dest_axi_stream module	2015-05-06 16:10:28 +03:00
request_generator.v	axi_dmac: request_generator: Stop generating requests when disabled	2015-02-19 17:22:23 +01:00
resp.h	Added axi_dmac, axi_fifo and misc files in library	2014-03-06 18:16:02 +02:00
response_generator.v	axi_dmac: response_generator: Do not generate responses during ID sync	2014-03-18 19:12:13 +01:00
response_handler.v	axi_dmac: Fix Vivado warnings	2014-03-18 20:59:13 +01:00
splitter.v	Added axi_dmac, axi_fifo and misc files in library	2014-03-06 18:16:02 +02:00
src_axi_mm.v	axi_dmac: Fix issues with non 64-bit AXI masters	2014-04-10 14:54:22 +02:00
src_axi_stream.v	axi_dmac: Add xfer_req signal to the streamin AXI source interface	2014-10-29 18:15:54 +01:00
src_fifo_inf.v	axi_dmac: fifo_inf: Handle overflow and underflow correctly	2015-02-19 17:22:21 +01:00