zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
pluto_hdl_adi/library
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
..
axi_ad6676 axi_ad6676: Updated constraints 2015-09-25 17:02:42 +03:00
axi_ad9122 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_ad9144 axi_ad9144: Updated altera interfaces, added FIFO conduits per channel 2015-11-24 11:44:07 +02:00
axi_ad9152 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_ad9234 axi_ad9234: Clock ratio is indicating a sampling clock ratio 2015-09-24 11:19:18 +03:00
axi_ad9250 axi_ad9250: Updated altera interfaces, added FIFO conduits per channel 2015-11-24 11:39:55 +02:00
axi_ad9265 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_ad9361 axi_ad9361: Updated altera interfaces, added FIFO conduits per channel 2015-11-24 11:21:08 +02:00
axi_ad9434 Make: Update Make files 2015-09-25 19:11:21 +03:00
axi_ad9467 Make: Update Make files 2015-09-25 19:11:21 +03:00
axi_ad9625 axi_ad9625: Updated constraints and added adc reset port 2015-09-25 17:16:31 +03:00
axi_ad9643 Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_ad9652 axi_ad9652: Updated with the latest constraints 2015-09-28 11:29:07 +03:00
axi_ad9671 axi_ad9671: Updated constraints 2015-10-09 13:15:55 +03:00
axi_ad9680 axi_ad9680: Updated altera interfaces, added FIFO conduits per channel 2015-11-24 11:45:12 +02:00
axi_ad9739a Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_adcfifo Revert commit 6b99ce 2015-08-26 13:48:28 +03:00
axi_clkgen library: Axi_clkgen, added register for controlling the source clock. 2015-11-25 11:16:32 +02:00
axi_dmac Merge branch 'master' into dev 2015-11-26 13:38:11 +02:00
axi_generic_adc Revert commit 6b99ce 2015-08-26 13:48:28 +03:00
axi_gpreg Makefiles: Update makefiles to include the nerw axi_gpreg / util_mfifo libraries 2015-11-10 09:32:50 +02:00
axi_hdmi_rx Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
axi_hdmi_tx axi_hdmi_tx: Add parameter to configure the output clock polarity 2015-11-03 10:59:13 +01:00
axi_i2s_adi Revert commit 6b99ce 2015-08-26 13:48:28 +03:00
axi_jesd_gt up_gt: separate pll resets to tx/rx 2015-10-02 13:58:30 -04:00
axi_jesd_xcvr xcvr- remove status constraint 2015-08-20 13:54:15 -04:00
axi_mc_controller axi_mc_controller: Removed channels, as no data needs to be streamed to DMA 2015-10-09 13:54:03 +03:00
axi_mc_current_monitor axi_mc_current_monitor: Removed stub channel 2015-10-09 13:52:14 +03:00
axi_mc_speed axi_mc_speed: Corrected maximum number of channels 2015-10-09 13:50:25 +03:00
axi_spdif_rx Revert commit 6b99ce 2015-08-26 13:48:28 +03:00
axi_spdif_tx Revert commit 6b99ce 2015-08-26 13:48:28 +03:00
axi_usb_fx3 axi_usb_fx3: Initial commit of the core with interface stub 2015-10-23 13:27:00 +03:00
cn0363 Add CN0363 project 2015-05-21 17:21:35 +02:00
common library: Axi_clkgen, added register for controlling the source clock. 2015-11-25 11:16:32 +02:00
cordic_demod Add cordic demodulator module 2015-05-21 17:21:35 +02:00
interfaces Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
prcfg library/prcfg : Split data bus to channels 2015-10-13 11:36:45 +03:00
scripts adi_ip.tcl: Add support for adding bd files to a core 2015-09-18 15:27:14 +02:00
spi_engine library: 2015.2 updates 2015-08-25 09:13:24 +03:00
util_adc_pack hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_adcfifo util_adcfifo: Updated altera interface 2015-11-25 10:20:06 +02:00
util_axis_fifo util_axis_fifo: Remove m_axis_addr_next output from the address modules 2015-09-21 17:58:01 +02:00
util_axis_resize hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_bsplit hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_ccat hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_cpack util_cpack: Updated altera interfaces 2015-11-24 11:18:18 +02:00
util_dac_unpack hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_dacfifo util_dacfifo: Update read out method 2015-10-08 17:13:12 +03:00
util_gmii_to_rgmii library: 2015.2 updates 2015-08-25 09:13:24 +03:00
util_gtlb util_gtlb: output receive/transmit clocks 2015-11-05 11:28:34 -05:00
util_i2c_mixer Add .gitattributes file 2015-06-26 11:07:10 +02:00
util_jesd_gt util_jesd_gt: bad idea, it is needed for ipi 2015-10-15 11:13:08 -04:00
util_mfifo Makefiles: Update makefiles to include the nerw axi_gpreg / util_mfifo libraries 2015-11-10 09:32:50 +02:00
util_pmod_adc Makefiles: Updated Makefiles 2015-10-23 10:44:27 +03:00
util_pmod_fmeter hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_rfifo hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_sigma_delta_spi hdl/library: Update the IP parameters 2015-08-19 14:11:47 +03:00
util_tdd_sync util_tdd_sync: Sync signals output reg is a false path source 2015-11-17 09:42:05 +02:00
util_upack util_upack: Updated altera interfaces 2015-11-24 11:17:02 +02:00
util_wfifo util_wfifo: Fix reset related timing violation 2015-09-23 16:36:33 +03:00
Makefile util_tdd_sync: Initial commit 2015-11-11 10:46:11 +02:00