zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
pluto_hdl_adi/library/axi_dmac
History
Istvan Csomortani 36febf8591 Merge branch 'master' into dev 
Conflicts:
	library/axi_ad9361/axi_ad9361_ip.tcl
	library/axi_dmac/Makefile
	library/axi_dmac/axi_dmac_constr.ttcl
	library/axi_dmac/axi_dmac_ip.tcl
	library/common/ad_tdd_control.v
	projects/daq2/common/daq2_bd.tcl
	projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl
	projects/fmcomms2/zc706pr/system_project.tcl
	projects/fmcomms2/zc706pr/system_top.v
	projects/usdrx1/common/usdrx1_bd.tcl

This merge was made, to recover any forgotten fixes from master,
before creating the new release branch. All conflicts were reviewed
and resolved.
 		2015-11-26 13:38:11 +02:00
..
bd axi_dmac: Fix typo on ./bd/bd.tcl 2015-09-23 15:51:50 +03:00
2d_transfer.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
Makefile Make: Update Make files 2015-09-25 19:11:21 +03:00
address_generator.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
axi_dmac.v axi_dmac: Remove unused address bits on AXI-Lite bus 2015-09-21 17:58:01 +02: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.ttcl axi_dmac: Change BRAM REGCEB constraint to set_false_path 2015-09-18 15:28:22 +02:00
axi_dmac_hw.tcl axi_dmac: Updated fifo interfaces for easier connectivity 2015-11-24 11:08:28 +02:00
axi_dmac_ip.tcl Merge branch 'master' into dev 2015-11-26 13:38:11 +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 hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
dest_axi_mm.v axi_dmac: Mark unused output ports explicitly as unconnected 2015-09-21 17:58:01 +02:00
dest_axi_stream.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
dest_fifo_inf.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
inc_id.h axi_dmac: Parameter changes 2015-08-20 16:06:26 +03:00
request_arb.v axi_dmac: Fix width for dest response FIFO 2015-09-21 17:58:01 +02:00
request_generator.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
resp.h Added axi_dmac, axi_fifo and misc files in library 2014-03-06 18:16:02 +02:00
response_generator.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
response_handler.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
splitter.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
src_axi_mm.v axi_dmac: Mark unused output ports explicitly as unconnected 2015-09-21 17:58:01 +02:00
src_axi_stream.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
src_fifo_inf.v hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00