From 33b265a7427b44dd43c12bbd44ee69d4fe93a563 Mon Sep 17 00:00:00 2001 From: Adrian Costina Date: Mon, 14 Mar 2016 09:31:17 +0200 Subject: [PATCH] Makefile: Update Makefiles --- library/axi_ad9361/Makefile | 4 +++ library/axi_jesd_gt/Makefile | 16 +++++++-- library/interfaces/Makefile | 55 ++++++++++++++++++++++-------- library/util_gtlb/Makefile | 14 ++++++-- library/util_jesd_gt/Makefile | 14 ++++++-- projects/pzsdr/Makefile | 3 ++ projects/pzsdr/ccbrk/Makefile | 1 + projects/pzsdr/ccbrk_cmos/Makefile | 9 ++--- projects/pzsdr/ccfmc/Makefile | 1 + projects/pzsdr/ccpci/Makefile | 1 + projects/usdrx1/a5gt/Makefile | 47 +++++++++++++++++++++++++ 11 files changed, 141 insertions(+), 24 deletions(-) diff --git a/library/axi_ad9361/Makefile b/library/axi_ad9361/Makefile index 702aba3f2..eb79b9900 100644 --- a/library/axi_ad9361/Makefile +++ b/library/axi_ad9361/Makefile @@ -13,6 +13,9 @@ M_DEPS += ../common/ad_rst.v M_DEPS += ../common/ad_lvds_clk.v M_DEPS += ../common/ad_lvds_in.v M_DEPS += ../common/ad_lvds_out.v +M_DEPS += ../common/ad_cmos_clk.v +M_DEPS += ../common/ad_cmos_in.v +M_DEPS += ../common/ad_cmos_out.v M_DEPS += ../common/ad_mul.v M_DEPS += ../common/ad_pnmon.v M_DEPS += ../common/ad_dds_sine.v @@ -35,6 +38,7 @@ 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_cmos_if.v M_DEPS += axi_ad9361_rx_pnmon.v M_DEPS += axi_ad9361_rx_channel.v M_DEPS += axi_ad9361_rx.v diff --git a/library/axi_jesd_gt/Makefile b/library/axi_jesd_gt/Makefile index 3ac3a89de..e8fdc5069 100644 --- a/library/axi_jesd_gt/Makefile +++ b/library/axi_jesd_gt/Makefile @@ -21,6 +21,16 @@ M_DEPS += ../common/up_gt_channel.v M_DEPS += ../common/up_gt.v M_DEPS += axi_jesd_gt_constr.xdc M_DEPS += axi_jesd_gt.v +M_DEPS += ../interfaces/if_gt_qpll.xml +M_DEPS += ../interfaces/if_gt_qpll_rtl.xml +M_DEPS += ../interfaces/if_gt_pll.xml +M_DEPS += ../interfaces/if_gt_pll_rtl.xml +M_DEPS += ../interfaces/if_gt_rx.xml +M_DEPS += ../interfaces/if_gt_rx_rtl.xml +M_DEPS += ../interfaces/if_gt_rx_ksig.xml +M_DEPS += ../interfaces/if_gt_rx_ksig_rtl.xml +M_DEPS += ../interfaces/if_gt_tx.xml +M_DEPS += ../interfaces/if_gt_tx_rtl.xml M_VIVADO := vivado -mode batch -source @@ -35,8 +45,8 @@ M_FLIST += .Xil -.PHONY: all clean clean-all -all: axi_jesd_gt.xpr +.PHONY: all dep clean clean-all +all: dep axi_jesd_gt.xpr clean:clean-all @@ -50,5 +60,7 @@ axi_jesd_gt.xpr: $(M_DEPS) rm -rf $(M_FLIST) $(M_VIVADO) axi_jesd_gt_ip.tcl >> axi_jesd_gt_ip.log 2>&1 +dep: + make -C ../interfaces #################################################################################### #################################################################################### diff --git a/library/interfaces/Makefile b/library/interfaces/Makefile index cb50c9c27..996cec8d9 100644 --- a/library/interfaces/Makefile +++ b/library/interfaces/Makefile @@ -11,31 +11,58 @@ M_DEPS += ../scripts/adi_ip.tcl M_VIVADO := vivado -mode batch -source -M_FLIST := *.cache -M_FLIST += *.data -M_FLIST += *.xpr -M_FLIST += *.log -M_FLIST += component.xml +M_FLIST := *.log M_FLIST += *.jou -M_FLIST += xgui -M_FLIST += .Xil - +M_FLIST += if_gt_qpll.xml +M_FLIST += if_gt_qpll_rtl.xml +M_FLIST += if_gt_pll.xml +M_FLIST += if_gt_pll_rtl.xml +M_FLIST += if_gt_rx.xml +M_FLIST += if_gt_rx_rtl.xml +M_FLIST += if_gt_tx.xml +M_FLIST += if_gt_tx_rtl.xml +M_FLIST += if_gt_rx_ksig.xml +M_FLIST += if_gt_rx_ksig_rtl.xml .PHONY: all clean clean-all -all: interfaces.xpr - +all: if_gt_qpll.xml if_gt_qpll_rtl.xml if_gt_pll.xml if_gt_pll_rtl.xml if_gt_rx.xml if_gt_rx_rtl.xml if_gt_tx.xml if_gt_tx_rtl.xml if_gt_rx_ksig.xml if_gt_rx_ksig_rtl.xml clean:clean-all - clean-all: rm -rf $(M_FLIST) +if_gt_qpll.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_qpll_rtl.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_pll.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_pll_rtl.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_rx.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_rx_rtl.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_tx.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_tx_rtl.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_rx_ksig.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 + +if_gt_rx_ksig_rtl.xml: + $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 -interfaces.xpr: $(M_DEPS) - rm -rf $(M_FLIST) - $(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1 #################################################################################### #################################################################################### diff --git a/library/util_gtlb/Makefile b/library/util_gtlb/Makefile index 3f3542448..8dc22b792 100644 --- a/library/util_gtlb/Makefile +++ b/library/util_gtlb/Makefile @@ -11,6 +11,14 @@ M_DEPS += ../scripts/adi_ip.tcl M_DEPS += ../common/up_xfer_status.v M_DEPS += util_gtlb_constr.xdc M_DEPS += util_gtlb.v +M_DEPS += ../interfaces/if_gt_qpll.xml +M_DEPS += ../interfaces/if_gt_qpll_rtl.xml +M_DEPS += ../interfaces/if_gt_pll.xml +M_DEPS += ../interfaces/if_gt_pll_rtl.xml +M_DEPS += ../interfaces/if_gt_rx.xml +M_DEPS += ../interfaces/if_gt_rx_rtl.xml +M_DEPS += ../interfaces/if_gt_tx.xml +M_DEPS += ../interfaces/if_gt_tx_rtl.xml M_VIVADO := vivado -mode batch -source @@ -25,8 +33,8 @@ M_FLIST += .Xil -.PHONY: all clean clean-all -all: util_gtlb.xpr +.PHONY: all dep clean clean-all +all: dep util_gtlb.xpr clean:clean-all @@ -40,5 +48,7 @@ util_gtlb.xpr: $(M_DEPS) rm -rf $(M_FLIST) $(M_VIVADO) util_gtlb_ip.tcl >> util_gtlb_ip.log 2>&1 +dep: + make -C ../interfaces #################################################################################### #################################################################################### diff --git a/library/util_jesd_gt/Makefile b/library/util_jesd_gt/Makefile index 618434618..c78666c37 100644 --- a/library/util_jesd_gt/Makefile +++ b/library/util_jesd_gt/Makefile @@ -9,6 +9,14 @@ M_DEPS := util_jesd_gt_ip.tcl M_DEPS += ../scripts/adi_env.tcl M_DEPS += ../scripts/adi_ip.tcl M_DEPS += util_jesd_gt.v +M_DEPS += ../interfaces/if_gt_qpll.xml +M_DEPS += ../interfaces/if_gt_qpll_rtl.xml +M_DEPS += ../interfaces/if_gt_pll.xml +M_DEPS += ../interfaces/if_gt_pll_rtl.xml +M_DEPS += ../interfaces/if_gt_rx.xml +M_DEPS += ../interfaces/if_gt_rx_rtl.xml +M_DEPS += ../interfaces/if_gt_tx.xml +M_DEPS += ../interfaces/if_gt_tx_rtl.xml M_VIVADO := vivado -mode batch -source @@ -23,8 +31,8 @@ M_FLIST += .Xil -.PHONY: all clean clean-all -all: util_jesd_gt.xpr +.PHONY: all dep clean clean-all +all: dep util_jesd_gt.xpr clean:clean-all @@ -38,5 +46,7 @@ util_jesd_gt.xpr: $(M_DEPS) rm -rf $(M_FLIST) $(M_VIVADO) util_jesd_gt_ip.tcl >> util_jesd_gt_ip.log 2>&1 +dep: + make -C ../interfaces #################################################################################### #################################################################################### diff --git a/projects/pzsdr/Makefile b/projects/pzsdr/Makefile index 924f12685..70c685d18 100644 --- a/projects/pzsdr/Makefile +++ b/projects/pzsdr/Makefile @@ -8,6 +8,7 @@ .PHONY: all clean clean-all all: -make -C ccbrk all + -make -C ccbrk_cmos all -make -C ccfmc all -make -C ccpci all -make -C ccbrk all @@ -15,6 +16,7 @@ all: clean: make -C ccbrk clean + make -C ccbrk_cmos clean make -C ccfmc clean make -C ccpci clean make -C ccbrk clean @@ -22,6 +24,7 @@ clean: clean-all: make -C ccbrk clean-all + make -C ccbrk_cmos clean-all make -C ccfmc clean-all make -C ccpci clean-all make -C ccbrk clean-all diff --git a/projects/pzsdr/ccbrk/Makefile b/projects/pzsdr/ccbrk/Makefile index 49d742665..7a8f44653 100644 --- a/projects/pzsdr/ccbrk/Makefile +++ b/projects/pzsdr/ccbrk/Makefile @@ -18,6 +18,7 @@ M_DEPS += ../../common/xilinx/sys_wfifo.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl +M_DEPS += ../../common/pzsdr/pzsdr_lvds_system_constr.xdc M_DEPS += ../../../library/common/ad_iobuf.v M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr diff --git a/projects/pzsdr/ccbrk_cmos/Makefile b/projects/pzsdr/ccbrk_cmos/Makefile index 49d742665..3f52934bb 100644 --- a/projects/pzsdr/ccbrk_cmos/Makefile +++ b/projects/pzsdr/ccbrk_cmos/Makefile @@ -7,9 +7,9 @@ M_DEPS += system_top.v M_DEPS += system_project.tcl -M_DEPS += system_constr.xdc M_DEPS += system_bd.tcl M_DEPS += ../common/ccbrk_bd.tcl +M_DEPS += ../ccbrk/system_constr.xdc M_DEPS += ../../scripts/adi_project.tcl M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../scripts/adi_board.tcl @@ -18,6 +18,7 @@ M_DEPS += ../../common/xilinx/sys_wfifo.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl +M_DEPS += ../../common/pzsdr/pzsdr_cmos_system_constr.xdc M_DEPS += ../../../library/common/ad_iobuf.v M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr @@ -45,7 +46,7 @@ M_FLIST += .Xil .PHONY: all lib clean clean-all -all: lib ccbrk_pzsdr.sdk/system_top.hdf +all: lib ccbrk_cmos_pzsdr.sdk/system_top.hdf clean: @@ -64,9 +65,9 @@ clean-all:clean make -C ../../../library/util_wfifo clean -ccbrk_pzsdr.sdk/system_top.hdf: $(M_DEPS) +ccbrk_cmos_pzsdr.sdk/system_top.hdf: $(M_DEPS) rm -rf $(M_FLIST) - $(M_VIVADO) system_project.tcl >> ccbrk_pzsdr_vivado.log 2>&1 + $(M_VIVADO) system_project.tcl >> ccbrk_cmos_pzsdr_vivado.log 2>&1 lib: diff --git a/projects/pzsdr/ccfmc/Makefile b/projects/pzsdr/ccfmc/Makefile index a29f3d69a..9f93d9e5b 100644 --- a/projects/pzsdr/ccfmc/Makefile +++ b/projects/pzsdr/ccfmc/Makefile @@ -18,6 +18,7 @@ M_DEPS += ../../common/xilinx/sys_wfifo.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl +M_DEPS += ../../common/pzsdr/pzsdr_lvds_system_constr.xdc M_DEPS += ../../../library/common/ad_iobuf.v M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr diff --git a/projects/pzsdr/ccpci/Makefile b/projects/pzsdr/ccpci/Makefile index 5668a66a3..5cdeb0619 100644 --- a/projects/pzsdr/ccpci/Makefile +++ b/projects/pzsdr/ccpci/Makefile @@ -18,6 +18,7 @@ M_DEPS += ../../common/xilinx/sys_wfifo.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl +M_DEPS += ../../common/pzsdr/pzsdr_lvds_system_constr.xdc M_DEPS += ../../../library/common/ad_iobuf.v M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr diff --git a/projects/usdrx1/a5gt/Makefile b/projects/usdrx1/a5gt/Makefile index d461204bb..e69a48ede 100644 --- a/projects/usdrx1/a5gt/Makefile +++ b/projects/usdrx1/a5gt/Makefile @@ -7,11 +7,58 @@ M_DEPS += system_project.tcl M_DEPS += ../common/usdrx1_spi.v +M_DEPS += ../common/usdrx1_bd.qsys M_DEPS += ../../scripts/adi_env.tcl M_DEPS += ../../common/a5gt/a5gt_system_bd.qsys M_DEPS += ../../common/a5gt/a5gt_system_assign.tcl M_DEPS += ../../../library/common/altera/ad_xcvr_rx_rst.v M_DEPS += ../../../library/common/altera/ad_jesd_align.v +M_DEPS += ../../../library/axi_ad9671/axi_ad9671.v +M_DEPS += ../../../library/axi_ad9671/axi_ad9671_channel.v +M_DEPS += ../../../library/axi_ad9671/axi_ad9671_hw.tcl +M_DEPS += ../../../library/axi_ad9671/axi_ad9671_if.v +M_DEPS += ../../../library/axi_ad9671/axi_ad9671_pnmon.v +M_DEPS += ../../../library/axi_dmac/2d_transfer.v +M_DEPS += ../../../library/axi_dmac/address_generator.v +M_DEPS += ../../../library/axi_dmac/axi_dmac.v +M_DEPS += ../../../library/axi_dmac/axi_dmac_hw.tcl +M_DEPS += ../../../library/axi_dmac/axi_register_slice.v +M_DEPS += ../../../library/axi_dmac/data_mover.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/inc_id.h +M_DEPS += ../../../library/axi_dmac/request_arb.v +M_DEPS += ../../../library/axi_dmac/request_generator.v +M_DEPS += ../../../library/axi_dmac/resp.h +M_DEPS += ../../../library/axi_dmac/response_generator.v +M_DEPS += ../../../library/axi_dmac/response_handler.v +M_DEPS += ../../../library/axi_dmac/splitter.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_jesd_xcvr/axi_jesd_xcvr.v +M_DEPS += ../../../library/axi_jesd_xcvr/axi_jesd_xcvr_hw.tcl +M_DEPS += ../../../library/common/ad_datafmt.v +M_DEPS += ../../../library/common/ad_jesd_align.v +M_DEPS += ../../../library/common/ad_mem.v +M_DEPS += ../../../library/common/ad_pnmon.v +M_DEPS += ../../../library/common/ad_rst.v +M_DEPS += ../../../library/common/sync_bits.v +M_DEPS += ../../../library/common/sync_gray.v +M_DEPS += ../../../library/common/up_adc_channel.v +M_DEPS += ../../../library/common/up_adc_common.v +M_DEPS += ../../../library/common/up_axi.v +M_DEPS += ../../../library/common/up_clock_mon.v +M_DEPS += ../../../library/common/up_delay_cntrl.v +M_DEPS += ../../../library/common/up_xcvr.v +M_DEPS += ../../../library/common/up_xfer_cntrl.v +M_DEPS += ../../../library/common/up_xfer_status.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/util_axis_fifo/util_axis_fifo.v +M_DEPS += ../../../library/util_axis_resize/util_axis_resize.v M_ALTERA := quartus_sh --64bit -t