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
..
axi_ad6676	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9122	Merge branch 'master' into dev	2015-08-17 15:15:58 +03:00
axi_ad9144	qsys- library group	2015-07-17 10:07:15 -04:00
axi_ad9152	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9234	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9250	qsys- library group	2015-07-17 10:07:15 -04:00
axi_ad9265	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9361	Merge branch 'master' into dev	2015-08-17 15:15:58 +03:00
axi_ad9434	axi_ad9434: Fix the up interface for IO_DELAYs	2015-08-06 15:17:19 +03:00
axi_ad9467	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9625	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_ad9643	ad9643- iqcor iqsel changes	2015-07-24 08:34:52 -04:00
axi_ad9652	ad9652- iqcor iqsel changes	2015-07-24 08:35:13 -04:00
axi_ad9671	Merge branch 'master' into dev	2015-08-17 15:15:58 +03:00
axi_ad9680	qsys- library group	2015-07-17 10:07:15 -04:00
axi_ad9739a	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_adcfifo	Add .gitattributes file	2015-06-26 11:07:10 +02:00
axi_clkgen	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_dmac	Merge branch 'master' into dev	2015-08-17 15:15:58 +03:00
axi_generic_adc	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_hdmi_rx	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_hdmi_tx	axi_hdmi_tx: common constraints & async resets	2015-08-13 13:03:51 -04:00
axi_i2s_adi	Add .gitattributes file	2015-06-26 11:07:10 +02:00
axi_jesd_gt	axi_jesd_gt-- gt interfaces	2015-08-14 15:34:49 -04:00
axi_jesd_xcvr	jesd-xcvr: constraints modifications	2015-07-22 12:46:06 -04:00
axi_mc_controller	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_mc_current_monitor	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_mc_speed	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
axi_spdif_rx	axi_spdif_rx: Fix the pl330_dma control path	2015-07-22 17:59:52 +03:00
axi_spdif_tx	Add .gitattributes file	2015-06-26 11:07:10 +02:00
cn0363	Add CN0363 project	2015-05-21 17:21:35 +02:00
common	common/ip-constrs- uniform simple constraints will do	2015-08-13 13:03:51 -04:00
controllerperipheralhdladi_pcore	Makefile: Added top level Makefile. Modified behavior of clean and clean-all	2015-04-17 17:22:38 +03:00
cordic_demod	Add cordic demodulator module	2015-05-21 17:21:35 +02:00
interfaces	interfaces-- transceiver cores	2015-08-14 15:33:36 -04:00
ip_pid_controller	Add .gitattributes file	2015-06-26 11:07:10 +02:00
prcfg	Add .gitattributes file	2015-06-26 11:07:10 +02:00
scripts	scripts-- add interface procedures	2015-08-14 15:33:58 -04:00
spi_engine	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_adc_pack	qsys- library group	2015-07-17 10:07:15 -04:00
util_adcfifo	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_axis_fifo	Refresh Makefiles	2015-05-21 14:21:54 +02:00
util_axis_resize	util_axis_resize: Changed _ip.tcl format to the standard format	2015-05-18 17:25:07 +03:00
util_bsplit	qsys- library group	2015-07-17 10:07:15 -04:00
util_ccat	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_cpack	util_cpack: Added reset interface	2015-07-28 11:00:54 +03:00
util_dac_unpack	qsys- library group	2015-07-17 10:07:15 -04:00
util_dacfifo	util_dacfifo: Add CDC logic for dma_lastaddr register.	2015-05-11 12:20:46 +03:00
util_gmii_to_rgmii	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_i2c_mixer	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_jesd_align	qsys- library group	2015-07-17 10:07:15 -04:00
util_jesd_gt	util_jesd_gt-- gt interfaces	2015-08-14 15:34:30 -04:00
util_jesd_xmit	qsys- library group	2015-07-17 10:07:15 -04:00
util_pmod_adc	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_pmod_fmeter	library: remove axi-min-size parameter	2015-05-19 13:07:48 -04:00
util_rfifo	Add .gitattributes file	2015-06-26 11:07:10 +02:00
util_sigma_delta_spi	Add util_sigma_delta_spi peripheral	2015-05-21 17:21:35 +02:00
util_upack	qsys- library group	2015-07-17 10:07:15 -04:00
util_wfifo	Makefile: Update Make files	2015-07-03 18:08:57 +03:00
Makefile	Makefile: Update Make files	2015-07-03 18:08:57 +03:00