diff --git a/library/axi_ad9361/Makefile b/library/axi_ad9361/Makefile index d5dfa399d..ec02723db 100644 --- a/library/axi_ad9361/Makefile +++ b/library/axi_ad9361/Makefile @@ -13,9 +13,9 @@ M_DEPS += ../common/ad_dds_1.v M_DEPS += ../common/ad_dds_sine.v M_DEPS += ../common/ad_iqcor.v M_DEPS += ../common/ad_pnmon.v +M_DEPS += ../common/ad_pps_receiver.v M_DEPS += ../common/ad_rst.v M_DEPS += ../common/ad_tdd_control.v -M_DEPS += ../common/ad_pps_receiver.v M_DEPS += ../common/up_adc_channel.v M_DEPS += ../common/up_adc_common.v M_DEPS += ../common/up_axi.v diff --git a/projects/daq1/Makefile b/projects/daq1/Makefile index 5b866a1ac..8c0cfc6f5 100644 --- a/projects/daq1/Makefile +++ b/projects/daq1/Makefile @@ -8,14 +8,17 @@ .PHONY: all clean clean-all all: -make -C zc706 all + -make -C zed all clean: make -C zc706 clean + make -C zed clean clean-all: make -C zc706 clean-all + make -C zed clean-all #################################################################################### #################################################################################### diff --git a/projects/daq1/zed/Makefile b/projects/daq1/zed/Makefile index 38f6a1f0e..e85809be4 100644 --- a/projects/daq1/zed/Makefile +++ b/projects/daq1/zed/Makefile @@ -16,22 +16,19 @@ M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../scripts/adi_board.tcl M_DEPS += ../../common/zed/zed_system_constr.xdc M_DEPS += ../../common/zed/zed_system_bd.tcl +M_DEPS += ../../common/xilinx/adcfifo_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v M_DEPS += ../../../library/axi_ad9122/axi_ad9122.xpr M_DEPS += ../../../library/axi_ad9684/axi_ad9684.xpr -M_DEPS += ../../../library/xilinx/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 M_DEPS += ../../../library/axi_i2s_adi/axi_i2s_adi.xpr M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr -M_DEPS += ../../../library/util_clkdiv/util_clkdiv.xpr +M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_i2c_mixer/util_i2c_mixer.xpr -M_DEPS += ../../../library/util_rfifo/util_rfifo.xpr -M_DEPS += ../../../library/util_tdd_sync/util_tdd_sync.xpr M_DEPS += ../../../library/util_upack/util_upack.xpr -M_DEPS += ../../../library/util_wfifo/util_wfifo.xpr M_VIVADO := vivado -mode batch -source @@ -62,19 +59,15 @@ clean: clean-all:clean make -C ../../../library/axi_ad9122 clean make -C ../../../library/axi_ad9684 clean - make -C ../../../library/xilinx/axi_adcfifo 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_clkdiv clean + make -C ../../../library/util_adcfifo clean make -C ../../../library/util_cpack clean make -C ../../../library/util_i2c_mixer clean - make -C ../../../library/util_rfifo clean - make -C ../../../library/util_tdd_sync clean make -C ../../../library/util_upack clean - make -C ../../../library/util_wfifo clean daq1_zed.sdk/system_top.hdf: $(M_DEPS) @@ -85,19 +78,15 @@ daq1_zed.sdk/system_top.hdf: $(M_DEPS) lib: make -C ../../../library/axi_ad9122 make -C ../../../library/axi_ad9684 - make -C ../../../library/xilinx/axi_adcfifo 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_clkdiv + make -C ../../../library/util_adcfifo make -C ../../../library/util_cpack make -C ../../../library/util_i2c_mixer - make -C ../../../library/util_rfifo - make -C ../../../library/util_tdd_sync make -C ../../../library/util_upack - make -C ../../../library/util_wfifo #################################################################################### #################################################################################### diff --git a/projects/daq3/Makefile b/projects/daq3/Makefile index 007fae804..f35ec817a 100644 --- a/projects/daq3/Makefile +++ b/projects/daq3/Makefile @@ -10,18 +10,21 @@ all: -make -C a10gx all -make -C kcu105 all -make -C zc706 all + -make -C zcu102 all clean: make -C a10gx clean make -C kcu105 clean make -C zc706 clean + make -C zcu102 clean clean-all: make -C a10gx clean-all make -C kcu105 clean-all make -C zc706 clean-all + make -C zcu102 clean-all #################################################################################### #################################################################################### diff --git a/projects/daq3/zcu102/Makefile b/projects/daq3/zcu102/Makefile index a33c128f2..c43e98c89 100644 --- a/projects/daq3/zcu102/Makefile +++ b/projects/daq3/zcu102/Makefile @@ -17,20 +17,18 @@ M_DEPS += ../../scripts/adi_board.tcl M_DEPS += ../../common/zcu102/zcu102_system_constr.xdc M_DEPS += ../../common/zcu102/zcu102_system_bd.tcl M_DEPS += ../../common/xilinx/dacfifo_bd.tcl +M_DEPS += ../../common/xilinx/adcfifo_bd.tcl M_DEPS += ../../../library/xilinx/common/ad_iobuf.v M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl M_DEPS += ../../../library/axi_ad9152/axi_ad9152.xpr M_DEPS += ../../../library/axi_ad9680/axi_ad9680.xpr -M_DEPS += ../../../library/xilinx/axi_adcfifo/axi_adcfifo.xpr M_DEPS += ../../../library/xilinx/axi_adxcvr/axi_adxcvr.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/jesd204/axi_jesd204_rx/axi_jesd204_rx.xpr M_DEPS += ../../../library/jesd204/axi_jesd204_tx/axi_jesd204_tx.xpr -M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr M_DEPS += ../../../library/jesd204/jesd204_rx/jesd204_rx.xpr M_DEPS += ../../../library/jesd204/jesd204_tx/jesd204_tx.xpr +M_DEPS += ../../../library/util_adcfifo/util_adcfifo.xpr M_DEPS += ../../../library/xilinx/util_adxcvr/util_adxcvr.xpr M_DEPS += ../../../library/util_cpack/util_cpack.xpr M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr @@ -65,16 +63,13 @@ clean: clean-all:clean make -C ../../../library/axi_ad9152 clean make -C ../../../library/axi_ad9680 clean - make -C ../../../library/xilinx/axi_adcfifo clean make -C ../../../library/xilinx/axi_adxcvr clean - make -C ../../../library/axi_clkgen clean make -C ../../../library/axi_dmac clean - make -C ../../../library/axi_hdmi_tx clean make -C ../../../library/jesd204/axi_jesd204_rx clean make -C ../../../library/jesd204/axi_jesd204_tx clean - make -C ../../../library/axi_spdif_tx clean make -C ../../../library/jesd204/jesd204_rx clean make -C ../../../library/jesd204/jesd204_tx clean + make -C ../../../library/util_adcfifo clean make -C ../../../library/xilinx/util_adxcvr clean make -C ../../../library/util_cpack clean make -C ../../../library/util_dacfifo clean @@ -89,16 +84,13 @@ daq3_zcu102.sdk/system_top.hdf: $(M_DEPS) lib: make -C ../../../library/axi_ad9152 make -C ../../../library/axi_ad9680 - make -C ../../../library/xilinx/axi_adcfifo make -C ../../../library/xilinx/axi_adxcvr - make -C ../../../library/axi_clkgen make -C ../../../library/axi_dmac - make -C ../../../library/axi_hdmi_tx make -C ../../../library/jesd204/axi_jesd204_rx make -C ../../../library/jesd204/axi_jesd204_tx - make -C ../../../library/axi_spdif_tx make -C ../../../library/jesd204/jesd204_rx make -C ../../../library/jesd204/jesd204_tx + make -C ../../../library/util_adcfifo make -C ../../../library/xilinx/util_adxcvr make -C ../../../library/util_cpack make -C ../../../library/util_dacfifo