From a679251d7d45fde552b744f60b2bbc43636860f7 Mon Sep 17 00:00:00 2001 From: Istvan Csomortani Date: Wed, 9 Sep 2015 17:13:19 +0300 Subject: [PATCH] Makefiles: Update Make --- library/Makefile | 12 ++--- library/axi_ad9361/Makefile | 4 +- library/axi_hdmi_tx/Makefile | 3 +- library/axi_jesd_gt/Makefile | 14 +++--- library/util_jesd_gt/Makefile | 18 +++----- projects/Makefile | 6 +++ projects/arradio/c5soc/Makefile | 69 +++-------------------------- projects/cftl_cip/zed/Makefile | 6 +-- projects/daq2/a10gx/Makefile | 4 ++ projects/daq2/kc705/Makefile | 3 ++ projects/daq2/kcu105/Makefile | 3 ++ projects/daq2/vc707/Makefile | 3 ++ projects/daq2/zc706/Makefile | 3 ++ projects/fmcjesdadc1/a5gt/Makefile | 4 ++ projects/fmcjesdadc1/a5soc/Makefile | 11 +++-- projects/fmcomms2/Makefile | 3 -- projects/motcon2_fmc/zed/Makefile | 3 ++ projects/pzsdr/rfsom/Makefile | 2 +- projects/pzslb/rfsom/Makefile | 45 +++---------------- projects/usdrx1/a5gt/Makefile | 7 +-- projects/usdrx1/zc706/Makefile | 6 +++ 21 files changed, 84 insertions(+), 145 deletions(-) diff --git a/library/Makefile b/library/Makefile index 9721436e7..044f6b861 100644 --- a/library/Makefile +++ b/library/Makefile @@ -41,8 +41,8 @@ clean: make -C axi_spdif_tx clean make -C cn0363/cn0363_dma_sequencer clean make -C cn0363/cn0363_phase_data_sync clean - make -C controllerperipheralhdladi_pcore clean make -C cordic_demod clean + make -C interfaces clean make -C spi_engine/axi_spi_engine clean make -C spi_engine/spi_engine_execution clean make -C spi_engine/spi_engine_interconnect clean @@ -57,9 +57,9 @@ clean: make -C util_dac_unpack clean make -C util_dacfifo clean make -C util_gmii_to_rgmii clean + make -C util_gtlb clean make -C util_i2c_mixer clean - make -C util_jesd_align clean - make -C util_jesd_xmit clean + make -C util_jesd_gt clean make -C util_pmod_adc clean make -C util_pmod_fmeter clean make -C util_rfifo clean @@ -103,8 +103,8 @@ lib: -make -C axi_spdif_tx -make -C cn0363/cn0363_dma_sequencer -make -C cn0363/cn0363_phase_data_sync - -make -C controllerperipheralhdladi_pcore -make -C cordic_demod + -make -C interfaces -make -C spi_engine/axi_spi_engine -make -C spi_engine/spi_engine_execution -make -C spi_engine/spi_engine_interconnect @@ -119,9 +119,9 @@ lib: -make -C util_dac_unpack -make -C util_dacfifo -make -C util_gmii_to_rgmii + -make -C util_gtlb -make -C util_i2c_mixer - -make -C util_jesd_align - -make -C util_jesd_xmit + -make -C util_jesd_gt -make -C util_pmod_adc -make -C util_pmod_fmeter -make -C util_rfifo diff --git a/library/axi_ad9361/Makefile b/library/axi_ad9361/Makefile index ccf54ee14..7297eacd3 100644 --- a/library/axi_ad9361/Makefile +++ b/library/axi_ad9361/Makefile @@ -8,6 +8,7 @@ M_DEPS := axi_ad9361_ip.tcl M_DEPS += ../scripts/adi_env.tcl M_DEPS += ../scripts/adi_ip.tcl +M_DEPS += ../common/ad_axi_ip_constr.xdc M_DEPS += ../common/ad_rst.v M_DEPS += ../common/ad_lvds_clk.v M_DEPS += ../common/ad_lvds_in.v @@ -23,7 +24,6 @@ M_DEPS += ../common/ad_iqcor.v M_DEPS += ../common/ad_addsub.v M_DEPS += ../common/ad_tdd_control.v M_DEPS += ../common/ad_tdd_sync.v -M_DEPS += ../common/ad_iobuf.v M_DEPS += ../common/up_axi.v M_DEPS += ../common/up_xfer_cntrl.v M_DEPS += ../common/up_xfer_status.v @@ -34,6 +34,7 @@ M_DEPS += ../common/up_adc_channel.v M_DEPS += ../common/up_dac_common.v M_DEPS += ../common/up_dac_channel.v M_DEPS += ../common/up_tdd_cntrl.v +M_DEPS += axi_ad9361_constr.xdc M_DEPS += axi_ad9361_dev_if.v M_DEPS += axi_ad9361_rx_pnmon.v M_DEPS += axi_ad9361_rx_channel.v @@ -42,7 +43,6 @@ M_DEPS += axi_ad9361_tx_channel.v M_DEPS += axi_ad9361_tx.v M_DEPS += axi_ad9361_tdd.v M_DEPS += axi_ad9361_tdd_if.v -M_DEPS += axi_ad9361_constr.xdc M_DEPS += axi_ad9361.v M_VIVADO := vivado -mode batch -source diff --git a/library/axi_hdmi_tx/Makefile b/library/axi_hdmi_tx/Makefile index 398684d2a..39f79bd36 100644 --- a/library/axi_hdmi_tx/Makefile +++ b/library/axi_hdmi_tx/Makefile @@ -8,6 +8,7 @@ M_DEPS := axi_hdmi_tx_ip.tcl M_DEPS += ../scripts/adi_env.tcl M_DEPS += ../scripts/adi_ip.tcl +M_DEPS += ../common/ad_axi_ip_constr.xdc M_DEPS += ../common/ad_mem.v M_DEPS += ../common/ad_rst.v M_DEPS += ../common/ad_csc_1_mul.v @@ -20,11 +21,11 @@ M_DEPS += ../common/up_xfer_cntrl.v M_DEPS += ../common/up_xfer_status.v M_DEPS += ../common/up_clock_mon.v M_DEPS += ../common/up_hdmi_tx.v +M_DEPS += axi_hdmi_tx_constr.xdc M_DEPS += axi_hdmi_tx_vdma.v M_DEPS += axi_hdmi_tx_es.v M_DEPS += axi_hdmi_tx_core.v M_DEPS += axi_hdmi_tx.v -M_DEPS += axi_hdmi_tx_constr.xdc M_VIVADO := vivado -mode batch -source diff --git a/library/axi_jesd_gt/Makefile b/library/axi_jesd_gt/Makefile index ab3dd9a88..3ac3a89de 100644 --- a/library/axi_jesd_gt/Makefile +++ b/library/axi_jesd_gt/Makefile @@ -8,15 +8,19 @@ M_DEPS := axi_jesd_gt_ip.tcl M_DEPS += ../scripts/adi_env.tcl M_DEPS += ../scripts/adi_ip.tcl -M_DEPS += ../common/ad_gt_common_1.v -M_DEPS += ../common/ad_gt_channel_1.v -M_DEPS += ../common/ad_gt_es.v -M_DEPS += ../common/ad_jesd_align.v M_DEPS += ../common/ad_rst.v +M_DEPS += ../common/ad_gt_channel.v +M_DEPS += ../common/ad_gt_common.v +M_DEPS += ../common/ad_gt_es.v +M_DEPS += ../common/ad_gt_es_axi.v +M_DEPS += ../common/ad_gt_channel_1.v +M_DEPS += ../common/ad_gt_common_1.v +M_DEPS += ../common/ad_jesd_align.v M_DEPS += ../common/up_axi.v +M_DEPS += ../common/up_gt_channel.v M_DEPS += ../common/up_gt.v -M_DEPS += axi_jesd_gt.v M_DEPS += axi_jesd_gt_constr.xdc +M_DEPS += axi_jesd_gt.v M_VIVADO := vivado -mode batch -source diff --git a/library/util_jesd_gt/Makefile b/library/util_jesd_gt/Makefile index ab3dd9a88..618434618 100644 --- a/library/util_jesd_gt/Makefile +++ b/library/util_jesd_gt/Makefile @@ -5,18 +5,10 @@ #################################################################################### #################################################################################### -M_DEPS := axi_jesd_gt_ip.tcl +M_DEPS := util_jesd_gt_ip.tcl M_DEPS += ../scripts/adi_env.tcl M_DEPS += ../scripts/adi_ip.tcl -M_DEPS += ../common/ad_gt_common_1.v -M_DEPS += ../common/ad_gt_channel_1.v -M_DEPS += ../common/ad_gt_es.v -M_DEPS += ../common/ad_jesd_align.v -M_DEPS += ../common/ad_rst.v -M_DEPS += ../common/up_axi.v -M_DEPS += ../common/up_gt.v -M_DEPS += axi_jesd_gt.v -M_DEPS += axi_jesd_gt_constr.xdc +M_DEPS += util_jesd_gt.v M_VIVADO := vivado -mode batch -source @@ -32,7 +24,7 @@ M_FLIST += .Xil .PHONY: all clean clean-all -all: axi_jesd_gt.xpr +all: util_jesd_gt.xpr clean:clean-all @@ -42,9 +34,9 @@ clean-all: rm -rf $(M_FLIST) -axi_jesd_gt.xpr: $(M_DEPS) +util_jesd_gt.xpr: $(M_DEPS) rm -rf $(M_FLIST) - $(M_VIVADO) axi_jesd_gt_ip.tcl >> axi_jesd_gt_ip.log 2>&1 + $(M_VIVADO) util_jesd_gt_ip.tcl >> util_jesd_gt_ip.log 2>&1 #################################################################################### #################################################################################### diff --git a/projects/Makefile b/projects/Makefile index 86faa06e0..10327b414 100644 --- a/projects/Makefile +++ b/projects/Makefile @@ -33,6 +33,8 @@ all: -make -C imageon all -make -C imageon_loopback all -make -C motcon2_fmc all + -make -C pzsdr all + -make -C pzslb all -make -C usdrx1 all @@ -63,6 +65,8 @@ clean: make -C imageon clean make -C imageon_loopback clean make -C motcon2_fmc clean + make -C pzsdr clean + make -C pzslb clean make -C usdrx1 clean @@ -93,6 +97,8 @@ clean-all: make -C imageon clean-all make -C imageon_loopback clean-all make -C motcon2_fmc clean-all + make -C pzsdr clean-all + make -C pzslb clean-all make -C usdrx1 clean-all #################################################################################### diff --git a/projects/arradio/c5soc/Makefile b/projects/arradio/c5soc/Makefile index fae9963ec..c52a06baa 100644 --- a/projects/arradio/c5soc/Makefile +++ b/projects/arradio/c5soc/Makefile @@ -9,70 +9,7 @@ M_DEPS := system_project.tcl M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../common/c5soc/c5soc_system_assign.tcl M_DEPS += ../../../projects/scripts/adi_tquest.tcl -M_DEPS += system_constr.sdc -M_DEPS += system_top.v -M_DEPS += system_bd.qsys -M_DEPS += ../../../library/util_adc_pack/util_adc_pack_hw.tcl -M_DEPS += ../../../library/util_adc_pack/util_adc_pack.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_hw.tcl -M_DEPS += ../../../library/common/ad_rst.v -M_DEPS += ../../../library/common/altera/ad_lvds_clk.v -M_DEPS += ../../../library/common/altera/ad_lvds_in.v -M_DEPS += ../../../library/common/altera/ad_lvds_out.v -M_DEPS += ../../../library/common/altera/MULT_MACRO.v -M_DEPS += ../../../library/common/altera/DSP48E1.v -M_DEPS += ../../../library/common/ad_mul.v -M_DEPS += ../../../library/common/ad_pnmon.v -M_DEPS += ../../../library/common/ad_dds_sine.v -M_DEPS += ../../../library/common/ad_dds_1.v -M_DEPS += ../../../library/common/ad_dds.v -M_DEPS += ../../../library/common/ad_datafmt.v -M_DEPS += ../../../library/common/ad_dcfilter.v -M_DEPS += ../../../library/common/ad_iqcor.v -M_DEPS += ../../../library/common/up_axi.v -M_DEPS += ../../../library/common/up_xfer_cntrl.v -M_DEPS += ../../../library/common/up_xfer_status.v -M_DEPS += ../../../library/common/up_clock_mon.v -M_DEPS += ../../../library/common/up_delay_cntrl.v -M_DEPS += ../../../library/common/up_adc_common.v -M_DEPS += ../../../library/common/up_adc_channel.v -M_DEPS += ../../../library/common/up_dac_common.v -M_DEPS += ../../../library/common/up_dac_channel.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_alt_lvds_tx.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_alt_lvds_rx.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_dev_if_alt.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_rx_pnmon.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_rx_channel.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_rx.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_tx_channel.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361_tx.v -M_DEPS += ../../../library/axi_ad9361/axi_ad9361.v -M_DEPS += ../../../library/axi_dmac/axi_dmac_hw.tcl -M_DEPS += ../../../library/common/sync_bits.v -M_DEPS += ../../../library/common/sync_gray.v -M_DEPS += ../../../library/util_axis_resize/util_axis_resize.v -M_DEPS += ../../../library/util_axis_fifo/util_axis_fifo.v -M_DEPS += ../../../library/util_axis_fifo/address_gray.v -M_DEPS += ../../../library/util_axis_fifo/address_gray_pipelined.v -M_DEPS += ../../../library/util_axis_fifo/address_sync.v -M_DEPS += ../../../library/axi_dmac/inc_id.h -M_DEPS += ../../../library/axi_dmac/resp.h -M_DEPS += ../../../library/axi_dmac/address_generator.v -M_DEPS += ../../../library/axi_dmac/data_mover.v -M_DEPS += ../../../library/axi_dmac/request_arb.v -M_DEPS += ../../../library/axi_dmac/request_generator.v -M_DEPS += ../../../library/axi_dmac/response_handler.v -M_DEPS += ../../../library/axi_dmac/axi_register_slice.v -M_DEPS += ../../../library/axi_dmac/2d_transfer.v -M_DEPS += ../../../library/axi_dmac/dest_axi_mm.v -M_DEPS += ../../../library/axi_dmac/dest_axi_stream.v -M_DEPS += ../../../library/axi_dmac/dest_fifo_inf.v -M_DEPS += ../../../library/axi_dmac/src_axi_mm.v -M_DEPS += ../../../library/axi_dmac/src_axi_stream.v -M_DEPS += ../../../library/axi_dmac/src_fifo_inf.v -M_DEPS += ../../../library/axi_dmac/splitter.v -M_DEPS += ../../../library/axi_dmac/response_generator.v -M_DEPS += ../../../library/axi_dmac/axi_dmac.v +M_DEPS += 0 M_ALTERA := quartus_sh --64bit -t @@ -92,7 +29,11 @@ M_FLIST += *.qsf M_FLIST += *.qpf M_FLIST += *.qws M_FLIST += *.sof +M_FLIST += *.cdf +M_FLIST += *.sld +M_FLIST += *.qdf M_FLIST += hc_output +M_FLIST += system_bd M_FLIST += hps_isw_handoff M_FLIST += hps_sdram_*.csv M_FLIST += *ddr3_*.csv diff --git a/projects/cftl_cip/zed/Makefile b/projects/cftl_cip/zed/Makefile index 44afddb39..0b5f8bba8 100644 --- a/projects/cftl_cip/zed/Makefile +++ b/projects/cftl_cip/zed/Makefile @@ -41,7 +41,7 @@ M_FLIST += .Xil .PHONY: all lib clean clean-all -all: lib cftl_custom_zed.sdk/system_top.hdf +all: lib cftl_cip_zed.sdk/system_top.hdf clean: @@ -59,9 +59,9 @@ clean-all:clean make -C ../../../library/util_pmod_fmeter clean -cftl_custom_zed.sdk/system_top.hdf: $(M_DEPS) +cftl_cip_zed.sdk/system_top.hdf: $(M_DEPS) rm -rf $(M_FLIST) - $(M_VIVADO) system_project.tcl >> cftl_custom_zed_vivado.log 2>&1 + $(M_VIVADO) system_project.tcl >> cftl_cip_zed_vivado.log 2>&1 lib: diff --git a/projects/daq2/a10gx/Makefile b/projects/daq2/a10gx/Makefile index 72cf3caff..d96d5a142 100644 --- a/projects/daq2/a10gx/Makefile +++ b/projects/daq2/a10gx/Makefile @@ -29,7 +29,11 @@ M_FLIST += *.qsf M_FLIST += *.qpf M_FLIST += *.qws M_FLIST += *.sof +M_FLIST += *.cdf +M_FLIST += *.sld +M_FLIST += *.qdf M_FLIST += hc_output +M_FLIST += system_bd M_FLIST += hps_isw_handoff M_FLIST += hps_sdram_*.csv M_FLIST += *ddr3_*.csv diff --git a/projects/daq2/kc705/Makefile b/projects/daq2/kc705/Makefile index 627756697..97a0ef418 100644 --- a/projects/daq2/kc705/Makefile +++ b/projects/daq2/kc705/Makefile @@ -26,6 +26,7 @@ M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr +M_DEPS += ../../../library/util_jesd_gt/util_jesd_gt.xpr M_DEPS += ../../../library/util_upack/util_upack.xpr M_VIVADO := vivado -mode batch -source @@ -59,6 +60,7 @@ clean-all:clean make -C ../../../library/util_adcfifo clean make -C ../../../library/util_cpack clean make -C ../../../library/util_dacfifo clean + make -C ../../../library/util_jesd_gt clean make -C ../../../library/util_upack clean @@ -75,6 +77,7 @@ lib: make -C ../../../library/util_adcfifo make -C ../../../library/util_cpack make -C ../../../library/util_dacfifo + make -C ../../../library/util_jesd_gt make -C ../../../library/util_upack #################################################################################### diff --git a/projects/daq2/kcu105/Makefile b/projects/daq2/kcu105/Makefile index 5cd6314ca..9cbbe7bf5 100644 --- a/projects/daq2/kcu105/Makefile +++ b/projects/daq2/kcu105/Makefile @@ -26,6 +26,7 @@ M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr +M_DEPS += ../../../library/util_jesd_gt/util_jesd_gt.xpr M_DEPS += ../../../library/util_upack/util_upack.xpr M_VIVADO := vivado -mode batch -source @@ -59,6 +60,7 @@ clean-all:clean make -C ../../../library/util_adcfifo clean make -C ../../../library/util_cpack clean make -C ../../../library/util_dacfifo clean + make -C ../../../library/util_jesd_gt clean make -C ../../../library/util_upack clean @@ -75,6 +77,7 @@ lib: make -C ../../../library/util_adcfifo make -C ../../../library/util_cpack make -C ../../../library/util_dacfifo + make -C ../../../library/util_jesd_gt make -C ../../../library/util_upack #################################################################################### diff --git a/projects/daq2/vc707/Makefile b/projects/daq2/vc707/Makefile index 614f2e94a..598300c5e 100644 --- a/projects/daq2/vc707/Makefile +++ b/projects/daq2/vc707/Makefile @@ -26,6 +26,7 @@ M_DEPS += ../../../library/axi_jesd_gt/axi_jesd_gt.xpr M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr +M_DEPS += ../../../library/util_jesd_gt/util_jesd_gt.xpr M_DEPS += ../../../library/util_upack/util_upack.xpr M_VIVADO := vivado -mode batch -source @@ -59,6 +60,7 @@ clean-all:clean make -C ../../../library/util_adcfifo clean make -C ../../../library/util_cpack clean make -C ../../../library/util_dacfifo clean + make -C ../../../library/util_jesd_gt clean make -C ../../../library/util_upack clean @@ -75,6 +77,7 @@ lib: make -C ../../../library/util_adcfifo make -C ../../../library/util_cpack make -C ../../../library/util_dacfifo + make -C ../../../library/util_jesd_gt make -C ../../../library/util_upack #################################################################################### diff --git a/projects/daq2/zc706/Makefile b/projects/daq2/zc706/Makefile index a8c99b062..1c8f9f76d 100644 --- a/projects/daq2/zc706/Makefile +++ b/projects/daq2/zc706/Makefile @@ -32,6 +32,7 @@ M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr +M_DEPS += ../../../library/util_jesd_gt/util_jesd_gt.xpr M_DEPS += ../../../library/util_upack/util_upack.xpr M_VIVADO := vivado -mode batch -source @@ -69,6 +70,7 @@ clean-all:clean make -C ../../../library/util_adcfifo clean make -C ../../../library/util_cpack clean make -C ../../../library/util_dacfifo clean + make -C ../../../library/util_jesd_gt clean make -C ../../../library/util_upack clean @@ -89,6 +91,7 @@ lib: make -C ../../../library/util_adcfifo make -C ../../../library/util_cpack make -C ../../../library/util_dacfifo + make -C ../../../library/util_jesd_gt make -C ../../../library/util_upack #################################################################################### diff --git a/projects/fmcjesdadc1/a5gt/Makefile b/projects/fmcjesdadc1/a5gt/Makefile index 5ea9ca222..13a3cf4d6 100644 --- a/projects/fmcjesdadc1/a5gt/Makefile +++ b/projects/fmcjesdadc1/a5gt/Makefile @@ -29,7 +29,11 @@ M_FLIST += *.qsf M_FLIST += *.qpf M_FLIST += *.qws M_FLIST += *.sof +M_FLIST += *.cdf +M_FLIST += *.sld +M_FLIST += *.qdf M_FLIST += hc_output +M_FLIST += system_bd M_FLIST += hps_isw_handoff M_FLIST += hps_sdram_*.csv M_FLIST += *ddr3_*.csv diff --git a/projects/fmcjesdadc1/a5soc/Makefile b/projects/fmcjesdadc1/a5soc/Makefile index 165f744a5..d3abf1e78 100644 --- a/projects/fmcjesdadc1/a5soc/Makefile +++ b/projects/fmcjesdadc1/a5soc/Makefile @@ -9,12 +9,7 @@ M_DEPS := system_project.tcl M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../common/a5soc/a5soc_system_assign.tcl M_DEPS += ../../../projects/scripts/adi_tquest.tcl -M_DEPS += ../../../library/common/altera/ad_jesd_align.v -M_DEPS += ../../../library/common/altera/ad_xcvr_rx_rst.v -M_DEPS += ../common/fmcjesdadc1_spi.v -M_DEPS += system_constr.sdc -M_DEPS += system_top.v -M_DEPS += system_bd.qsys +M_DEPS += 0 M_ALTERA := quartus_sh --64bit -t @@ -34,7 +29,11 @@ M_FLIST += *.qsf M_FLIST += *.qpf M_FLIST += *.qws M_FLIST += *.sof +M_FLIST += *.cdf +M_FLIST += *.sld +M_FLIST += *.qdf M_FLIST += hc_output +M_FLIST += system_bd M_FLIST += hps_isw_handoff M_FLIST += hps_sdram_*.csv M_FLIST += *ddr3_*.csv diff --git a/projects/fmcomms2/Makefile b/projects/fmcomms2/Makefile index 4df0ff0b6..3b90c96a0 100644 --- a/projects/fmcomms2/Makefile +++ b/projects/fmcomms2/Makefile @@ -10,7 +10,6 @@ all: -make -C ac701 all -make -C kc705 all -make -C mitx045 all - -make -C rfsom all -make -C vc707 all -make -C zc702 all -make -C zc706 all @@ -22,7 +21,6 @@ clean: make -C ac701 clean make -C kc705 clean make -C mitx045 clean - make -C rfsom clean make -C vc707 clean make -C zc702 clean make -C zc706 clean @@ -34,7 +32,6 @@ clean-all: make -C ac701 clean-all make -C kc705 clean-all make -C mitx045 clean-all - make -C rfsom clean-all make -C vc707 clean-all make -C zc702 clean-all make -C zc706 clean-all diff --git a/projects/motcon2_fmc/zed/Makefile b/projects/motcon2_fmc/zed/Makefile index 8d260f455..8d40bd939 100644 --- a/projects/motcon2_fmc/zed/Makefile +++ b/projects/motcon2_fmc/zed/Makefile @@ -25,6 +25,7 @@ M_DEPS += ../../../library/axi_mc_current_monitor/axi_mc_current_monitor.xpr M_DEPS += ../../../library/axi_mc_speed/axi_mc_speed.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr M_DEPS += ../../../library/util_adc_pack/util_adc_pack.xpr +M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_gmii_to_rgmii/util_gmii_to_rgmii.xpr M_DEPS += ../../../library/util_i2c_mixer/util_i2c_mixer.xpr @@ -61,6 +62,7 @@ clean-all:clean make -C ../../../library/axi_mc_speed clean make -C ../../../library/axi_spdif_tx clean make -C ../../../library/util_adc_pack clean + make -C ../../../library/util_cpack clean make -C ../../../library/util_gmii_to_rgmii clean make -C ../../../library/util_i2c_mixer clean @@ -80,6 +82,7 @@ lib: make -C ../../../library/axi_mc_speed make -C ../../../library/axi_spdif_tx make -C ../../../library/util_adc_pack + make -C ../../../library/util_cpack make -C ../../../library/util_gmii_to_rgmii make -C ../../../library/util_i2c_mixer diff --git a/projects/pzsdr/rfsom/Makefile b/projects/pzsdr/rfsom/Makefile index 95831ad0a..7b171ccdb 100644 --- a/projects/pzsdr/rfsom/Makefile +++ b/projects/pzsdr/rfsom/Makefile @@ -16,7 +16,7 @@ M_DEPS += ../../common/rfsom/rfsom_system_constr.xdc M_DEPS += system_bd.tcl M_DEPS += ../../common/rfsom/rfsom_system_bd.tcl M_DEPS += ../../common/xilinx/sys_wfifo.tcl -M_DEPS += ../../../projects/fmcomms2/common/fmcomms2_bd.tcl +M_DEPS += ../../fmcomms2/common/fmcomms2_bd.tcl M_DEPS += ../../common/rfsom/rfsom_system_ps7.tcl M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr diff --git a/projects/pzslb/rfsom/Makefile b/projects/pzslb/rfsom/Makefile index 95831ad0a..33805a915 100644 --- a/projects/pzslb/rfsom/Makefile +++ b/projects/pzslb/rfsom/Makefile @@ -6,27 +6,14 @@ #################################################################################### M_DEPS := system_project.tcl -M_DEPS += ../../scripts/adi_env.tcl -M_DEPS += ../../scripts/adi_project.tcl -M_DEPS += ../../scripts/adi_board.tcl +M_DEPS += ../../scripts/adi_env.tcl-notrace +M_DEPS += ../../scripts/adi_project.tcl-notrace +M_DEPS += ../../scripts/adi_board.tcl-notrace M_DEPS += system_top.v M_DEPS += system_constr.xdc M_DEPS += ../../../library/common/ad_iobuf.v +M_DEPS += ../../pzsdr/rfsom/system_constr.xdc M_DEPS += ../../common/rfsom/rfsom_system_constr.xdc -M_DEPS += system_bd.tcl -M_DEPS += ../../common/rfsom/rfsom_system_bd.tcl -M_DEPS += ../../common/xilinx/sys_wfifo.tcl -M_DEPS += ../../../projects/fmcomms2/common/fmcomms2_bd.tcl -M_DEPS += ../../common/rfsom/rfsom_system_ps7.tcl -M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr -M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr -M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr -M_DEPS += ../../../library/axi_hdmi_tx/axi_hdmi_tx.xpr -M_DEPS += ../../../library/axi_i2s_adi/axi_i2s_adi.xpr -M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr -M_DEPS += ../../../library/util_cpack/util_cpack.xpr -M_DEPS += ../../../library/util_upack/util_upack.xpr -M_DEPS += ../../../library/util_wfifo/util_wfifo.xpr M_VIVADO := vivado -mode batch -source @@ -44,7 +31,7 @@ M_FLIST += .Xil .PHONY: all lib clean clean-all -all: lib pzsdr_rfsom.sdk/system_top.hdf +all: lib pzslb_rfsom.sdk/system_top.hdf clean: @@ -52,32 +39,14 @@ clean: clean-all:clean - make -C ../../../library/axi_ad9361 clean - make -C ../../../library/axi_clkgen clean - make -C ../../../library/axi_dmac clean - make -C ../../../library/axi_hdmi_tx clean - make -C ../../../library/axi_i2s_adi clean - make -C ../../../library/axi_spdif_tx clean - make -C ../../../library/util_cpack clean - make -C ../../../library/util_upack clean - make -C ../../../library/util_wfifo clean -pzsdr_rfsom.sdk/system_top.hdf: $(M_DEPS) +pzslb_rfsom.sdk/system_top.hdf: $(M_DEPS) rm -rf $(M_FLIST) - $(M_VIVADO) system_project.tcl >> pzsdr_rfsom_vivado.log 2>&1 + $(M_VIVADO) system_project.tcl >> pzslb_rfsom_vivado.log 2>&1 lib: - make -C ../../../library/axi_ad9361 - make -C ../../../library/axi_clkgen - make -C ../../../library/axi_dmac - make -C ../../../library/axi_hdmi_tx - make -C ../../../library/axi_i2s_adi - make -C ../../../library/axi_spdif_tx - make -C ../../../library/util_cpack - make -C ../../../library/util_upack - make -C ../../../library/util_wfifo #################################################################################### #################################################################################### diff --git a/projects/usdrx1/a5gt/Makefile b/projects/usdrx1/a5gt/Makefile index 53979eda4..565d62cee 100644 --- a/projects/usdrx1/a5gt/Makefile +++ b/projects/usdrx1/a5gt/Makefile @@ -9,9 +9,6 @@ M_DEPS := system_project.tcl M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../common/a5gt/a5gt_system_assign.tcl M_DEPS += ../../../projects/scripts/adi_tquest.tcl -M_DEPS += ../../../library/common/altera/ad_jesd_align.v -M_DEPS += ../../../library/common/altera/ad_xcvr_rx_rst.v -M_DEPS += ../common/usdrx1_spi.v M_DEPS += 0 @@ -32,7 +29,11 @@ M_FLIST += *.qsf M_FLIST += *.qpf M_FLIST += *.qws M_FLIST += *.sof +M_FLIST += *.cdf +M_FLIST += *.sld +M_FLIST += *.qdf M_FLIST += hc_output +M_FLIST += system_bd M_FLIST += hps_isw_handoff M_FLIST += hps_sdram_*.csv M_FLIST += *ddr3_*.csv diff --git a/projects/usdrx1/zc706/Makefile b/projects/usdrx1/zc706/Makefile index 4b1670742..7055b767f 100644 --- a/projects/usdrx1/zc706/Makefile +++ b/projects/usdrx1/zc706/Makefile @@ -12,11 +12,15 @@ M_DEPS += ../../scripts/adi_board.tcl M_DEPS += system_top.v M_DEPS += system_constr.xdc M_DEPS += ../common/usdrx1_spi.v +M_DEPS += ../../common/zc706/zc706_system_mig_constr.xdc M_DEPS += ../../common/zc706/zc706_system_constr.xdc M_DEPS += system_bd.tcl M_DEPS += ../../common/zc706/zc706_system_bd.tcl +M_DEPS += ../../common/zc706/zc706_system_plddr3.tcl M_DEPS += ../common/usdrx1_bd.tcl +M_DEPS += ../../common/zc706/zc706_system_mig.prj M_DEPS += ../../../library/axi_ad9671/axi_ad9671.xpr +M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr M_DEPS += ../../../library/axi_hdmi_tx/axi_hdmi_tx.xpr @@ -49,6 +53,7 @@ clean: clean-all:clean make -C ../../../library/axi_ad9671 clean + make -C ../../../library/axi_adcfifo clean make -C ../../../library/axi_clkgen clean make -C ../../../library/axi_dmac clean make -C ../../../library/axi_hdmi_tx clean @@ -64,6 +69,7 @@ usdrx1_zc706.sdk/system_top.hdf: $(M_DEPS) lib: make -C ../../../library/axi_ad9671 + make -C ../../../library/axi_adcfifo make -C ../../../library/axi_clkgen make -C ../../../library/axi_dmac make -C ../../../library/axi_hdmi_tx