zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
pluto_hdl_adi/projects
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
..
ad6676evb Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
ad9265_fmc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
ad9434_fmc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
ad9467_fmc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
ad9739a_fmc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
adv7511 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
arradio arradio: Updated c5soc project 2015-11-24 13:27:44 +02:00
cftl_cip Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
cftl_std Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
cn0363 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
common c5soc: Updated common design 2015-11-24 13:22:01 +02:00
daq1 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
daq2 daq2: A10GX, add project specific IP search paths 2015-11-25 10:58:36 +02:00
daq3 daq3: updates 2015-11-13 13:17:11 -05:00
fmcadc2 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
fmcadc4 Makefiles: Update makefiles to include the nerw axi_gpreg / util_mfifo libraries 2015-11-10 09:32:50 +02:00
fmcadc5 Makefiles: Update makefiles to include the nerw axi_gpreg / util_mfifo libraries 2015-11-10 09:32:50 +02:00
fmcjesdadc1 fmcjesdadc1: Updated a5soc design 2015-11-24 15:39:52 +02:00
fmcomms1 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
fmcomms2 fmcomms2: Delete unnecessary clock definition 2015-11-20 19:35:37 +02:00
fmcomms5 fmcomms5: Added wfifo at the between AD9361 and cpack core 2015-11-13 15:50:32 +02:00
fmcomms6 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
fmcomms7 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
imageon Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
motcon2_fmc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
pzsdr ccpci- remove ps7 ddr hp0 access 2015-11-19 16:42:02 -05:00
scripts adi_project: Regenerate the layout of the IP Integrator subsystem design. 2015-11-09 11:01:10 +02:00
usb_fx3 usb_fx3: Added axi_usb_fx3 core and DMA to the project 2015-10-27 09:41:18 +02:00
usdrx1 Merge branch 'master' into dev 2015-11-26 13:38:11 +02:00
Makefile Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00