make updates

2016-07-06 15:02:00 -04:00 · 2016-07-06 15:02:00 -04:00 · 48762519b5
parent 427cc84bb2
commit 48762519b5
7 changed files with 142 additions and 10 deletions
--- a/library/Makefile
+++ b/library/Makefile
@ -15,6 +15,7 @@ clean:
 	make -C axi_ad9122 clean
 	make -C axi_ad9144 clean
 	make -C axi_ad9152 clean
+	make -C axi_ad9162 clean
 	make -C axi_ad9234 clean
 	make -C axi_ad9250 clean
 	make -C axi_ad9265 clean
@ -55,6 +56,7 @@ clean:
 	make -C spi_engine/spi_engine_offload clean
 	make -C util_adc_pack clean
 	make -C util_adcfifo clean
+	make -C util_adxcvr clean
 	make -C util_axis_fifo clean
 	make -C util_axis_resize clean
 	make -C util_bsplit clean
@ -85,6 +87,7 @@ lib:
 	-make -C axi_ad9122
 	-make -C axi_ad9144
 	-make -C axi_ad9152
+	-make -C axi_ad9162
 	-make -C axi_ad9234
 	-make -C axi_ad9250
 	-make -C axi_ad9265
@ -125,6 +128,7 @@ lib:
 	-make -C spi_engine/spi_engine_offload
 	-make -C util_adc_pack
 	-make -C util_adcfifo
+	-make -C util_adxcvr
 	-make -C util_axis_fifo
 	-make -C util_axis_resize
 	-make -C util_bsplit
--- a/library/axi_ad9162/Makefile
+++ b/library/axi_ad9162/Makefile
@ -0,0 +1,61 @@
+####################################################################################
+####################################################################################
+## Copyright 2011(c) Analog Devices, Inc.
+## Auto-generated, do not modify!
+####################################################################################
+####################################################################################
+
+M_DEPS := axi_ad9162_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_mul.v
+M_DEPS += ../common/ad_dds_sine.v
+M_DEPS += ../common/ad_dds_1.v
+M_DEPS += ../common/ad_dds.v
+M_DEPS += ../common/ad_rst.v
+M_DEPS += ../common/up_axi.v
+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_dac_common.v
+M_DEPS += ../common/up_dac_channel.v
+M_DEPS += axi_ad9162_channel.v
+M_DEPS += axi_ad9162_core.v
+M_DEPS += axi_ad9162_if.v
+M_DEPS += axi_ad9162.v
+
+M_VIVADO := vivado -mode batch -source
+
+M_FLIST := *.cache
+M_FLIST += *.data
+M_FLIST += *.xpr
+M_FLIST += *.log
+M_FLIST += component.xml
+M_FLIST += *.jou
+M_FLIST +=  xgui
+M_FLIST += *.ip_user_files
+M_FLIST += *.srcs
+M_FLIST += *.hw
+M_FLIST += *.sim
+M_FLIST += .Xil
+
+
+
+.PHONY: all clean clean-all
+all: axi_ad9162.xpr
+
+
+clean:clean-all
+
+
+clean-all:
+	rm -rf $(M_FLIST)
+
+
+axi_ad9162.xpr: $(M_DEPS)
+	rm -rf $(M_FLIST)
+	$(M_VIVADO) axi_ad9162_ip.tcl  >> axi_ad9162_ip.log 2>&1
+
+####################################################################################
+####################################################################################
--- a/library/interfaces/Makefile
+++ b/library/interfaces/Makefile
@ -13,6 +13,10 @@ M_VIVADO := vivado -mode batch -source

 M_FLIST := *.log
 M_FLIST += *.jou
+M_FLIST += if_xcvr_cm.xml
+M_FLIST += if_xcvr_cm_rtl.xml
+M_FLIST += if_xcvr_ch.xml
+M_FLIST += if_xcvr_ch_rtl.xml
 M_FLIST += if_gt_qpll.xml
 M_FLIST += if_gt_qpll_rtl.xml
 M_FLIST += if_gt_pll.xml
@ -26,13 +30,25 @@ M_FLIST += if_gt_rx_ksig_rtl.xml


 .PHONY: all clean clean-all
-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 
+all: if_xcvr_cm.xml if_xcvr_cm_rtl.xml if_xcvr_ch.xml if_xcvr_ch_rtl.xml 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_xcvr_cm.xml:
+	$(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1
+
+if_xcvr_cm_rtl.xml:
+	$(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1
+
+if_xcvr_ch.xml:
+	$(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1
+
+if_xcvr_ch_rtl.xml:
+	$(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1
+
 if_gt_qpll.xml:
 	$(M_VIVADO) interfaces_ip.tcl >> interfaces_ip.log 2>&1

--- a/library/util_adxcvr/Makefile
+++ b/library/util_adxcvr/Makefile
@ -0,0 +1,54 @@
+####################################################################################
+####################################################################################
+## Copyright 2011(c) Analog Devices, Inc.
+## Auto-generated, do not modify!
+####################################################################################
+####################################################################################
+
+M_DEPS := util_adxcvr_ip.tcl
+M_DEPS += ../scripts/adi_env.tcl
+M_DEPS += ../scripts/adi_ip.tcl
+M_DEPS += util_adxcvr_xcm.v
+M_DEPS += util_adxcvr_xch.v
+M_DEPS += util_adxcvr.v
+M_DEPS += ../interfaces/if_xcvr_cm.xml
+M_DEPS += ../interfaces/if_xcvr_cm_rtl.xml
+M_DEPS += ../interfaces/if_xcvr_ch.xml
+M_DEPS += ../interfaces/if_xcvr_ch_rtl.xml
+
+M_VIVADO := vivado -mode batch -source
+
+M_FLIST := *.cache
+M_FLIST += *.data
+M_FLIST += *.xpr
+M_FLIST += *.log
+M_FLIST += component.xml
+M_FLIST += *.jou
+M_FLIST +=  xgui
+M_FLIST += *.ip_user_files
+M_FLIST += *.srcs
+M_FLIST += *.hw
+M_FLIST += *.sim
+M_FLIST += .Xil
+
+
+
+.PHONY: all dep clean clean-all
+all: dep util_adxcvr.xpr
+
+
+clean:clean-all
+
+
+clean-all:
+	rm -rf $(M_FLIST)
+
+
+util_adxcvr.xpr: $(M_DEPS)
+	rm -rf $(M_FLIST)
+	$(M_VIVADO) util_adxcvr_ip.tcl  >> util_adxcvr_ip.log 2>&1
+
+dep:
+	make -C ../interfaces
+####################################################################################
+####################################################################################
--- a/projects/Makefile
+++ b/projects/Makefile
@ -8,8 +8,8 @@
 .PHONY: all clean clean_all
 all:
 	-make -C ad6676evb all
-	-make -C ad7768evb all
 	-make -C ad7616_sdz all
+	-make -C ad7768evb all
 	-make -C ad9265_fmc all
 	-make -C ad9434_fmc all
 	-make -C ad9467_fmc all
@ -44,8 +44,8 @@ all:

 clean:
 	make -C ad6676evb clean
-	make -C ad7768evb clean
 	make -C ad7616_sdz clean
+	make -C ad7768evb clean
 	make -C ad9265_fmc clean
 	make -C ad9434_fmc clean
 	make -C ad9467_fmc clean
@ -80,8 +80,8 @@ clean:

 clean-all:
 	make -C ad6676evb clean-all
-	make -C ad7768evb clean-all
 	make -C ad7616_sdz clean-all
+	make -C ad7768evb clean-all
 	make -C ad9265_fmc clean-all
 	make -C ad9434_fmc clean-all
 	make -C ad9467_fmc clean-all
--- a/projects/fmcomms11/zc706/Makefile
+++ b/projects/fmcomms11/zc706/Makefile
@ -21,7 +21,7 @@ M_DEPS += ../../common/zc706/zc706_system_constr.xdc
 M_DEPS += ../../common/zc706/zc706_system_bd.tcl
 M_DEPS += ../../common/xilinx/sys_dmafifo.tcl
 M_DEPS += ../../../library/common/ad_iobuf.v
-M_DEPS += ../../../library/axi_ad9144/axi_ad9144.xpr
+M_DEPS += ../../../library/axi_ad9162/axi_ad9162.xpr
 M_DEPS += ../../../library/axi_ad9625/axi_ad9625.xpr
 M_DEPS += ../../../library/axi_adcfifo/axi_adcfifo.xpr
 M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr
@ -59,7 +59,7 @@ clean:


 clean-all:clean
-	make -C ../../../library/axi_ad9144 clean
+	make -C ../../../library/axi_ad9162 clean
 	make -C ../../../library/axi_ad9625 clean
 	make -C ../../../library/axi_adcfifo clean
 	make -C ../../../library/axi_clkgen clean
@ -78,7 +78,7 @@ fmcomms11_zc706.sdk/system_top.hdf: $(M_DEPS)


 lib:
-	make -C ../../../library/axi_ad9144
+	make -C ../../../library/axi_ad9162
 	make -C ../../../library/axi_ad9625
 	make -C ../../../library/axi_adcfifo
 	make -C ../../../library/axi_clkgen
--- a/projects/fmcomms2/Makefile
+++ b/projects/fmcomms2/Makefile
@ -7,7 +7,6 @@

 .PHONY: all clean clean-all 
 all:
-	-make -C a10soc all
 	-make -C ac701 all
 	-make -C kc705 all
 	-make -C mitx045 all
@ -19,7 +18,6 @@ all:


 clean: 
-	make -C a10soc clean
 	make -C ac701 clean
 	make -C kc705 clean
 	make -C mitx045 clean
@ -31,7 +29,6 @@ clean:


 clean-all:
-	make -C a10soc clean-all
 	make -C ac701 clean-all
 	make -C kc705 clean-all
 	make -C mitx045 clean-all