From 0442e7d404fe554f28618929c9e23d2756020cbc Mon Sep 17 00:00:00 2001 From: Istvan Csomortani Date: Thu, 27 Apr 2017 15:35:39 +0300 Subject: [PATCH] util_adxcvr: Fix parameter setup at instantiation If a parameter value is defined as a string binary (e.g. "001001000000"), it can confuse the tool, and the value may be used as a decimal number. To prevent this issue and to improve readability converting all the binary constants into hexadecimal. --- projects/ad6676evb/common/ad6676evb_bd.tcl | 2 +- projects/fmcadc2/common/fmcadc2_bd.tcl | 2 +- projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl | 2 +- projects/fmcomms11/common/fmcomms11_bd.tcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/ad6676evb/common/ad6676evb_bd.tcl b/projects/ad6676evb/common/ad6676evb_bd.tcl index aa02cfe86..697bd05d3 100644 --- a/projects/ad6676evb/common/ad6676evb_bd.tcl +++ b/projects/ad6676evb/common/ad6676evb_bd.tcl @@ -34,7 +34,7 @@ ad_ip_parameter axi_ad6676_dma CONFIG.DMA_DATA_WIDTH_DEST 64 # transceiver core ad_ip_instance util_adxcvr util_ad6676_xcvr -ad_ip_parameter util_ad6676_xcvr CONFIG.QPLL_FBDIV "0010000000" +ad_ip_parameter util_ad6676_xcvr CONFIG.QPLL_FBDIV 0x80 ad_ip_parameter util_ad6676_xcvr CONFIG.CPLL_FBDIV 2 ad_ip_parameter util_ad6676_xcvr CONFIG.CPLL_FBDIV_4_5 5 ad_ip_parameter util_ad6676_xcvr CONFIG.TX_NUM_OF_LANES 0 diff --git a/projects/fmcadc2/common/fmcadc2_bd.tcl b/projects/fmcadc2/common/fmcadc2_bd.tcl index d4d83ea28..5c788a826 100644 --- a/projects/fmcadc2/common/fmcadc2_bd.tcl +++ b/projects/fmcadc2/common/fmcadc2_bd.tcl @@ -28,7 +28,7 @@ ad_ip_parameter axi_ad9625_dma CONFIG.DMA_DATA_WIDTH_SRC 64 ad_ip_parameter axi_ad9625_dma CONFIG.DMA_DATA_WIDTH_DEST 64 ad_ip_instance util_adxcvr util_fmcadc2_xcvr -ad_ip_parameter util_fmcadc2_xcvr CONFIG.QPLL_FBDIV "0010000000" ;# N = 40 +ad_ip_parameter util_fmcadc2_xcvr CONFIG.QPLL_FBDIV 0x80 ;# N = 40 ad_ip_parameter util_fmcadc2_xcvr CONFIG.CPLL_FBDIV 1 ad_ip_parameter util_fmcadc2_xcvr CONFIG.TX_NUM_OF_LANES 0 ad_ip_parameter util_fmcadc2_xcvr CONFIG.TX_OUT_DIV 1 diff --git a/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl b/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl index 3a3650e25..8a7213ead 100644 --- a/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl +++ b/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl @@ -54,7 +54,7 @@ ad_ip_parameter axi_ad9250_1_dma CONFIG.DMA_DATA_WIDTH_DEST 64 # transceiver core ad_ip_instance util_adxcvr util_fmcjesdadc1_xcvr -ad_ip_parameter util_fmcjesdadc1_xcvr CONFIG.QPLL_FBDIV "0010000000" +ad_ip_parameter util_fmcjesdadc1_xcvr CONFIG.QPLL_FBDIV 0x80 ad_ip_parameter util_fmcjesdadc1_xcvr CONFIG.CPLL_FBDIV 2 ad_ip_parameter util_fmcjesdadc1_xcvr CONFIG.TX_NUM_OF_LANES 0 ad_ip_parameter util_fmcjesdadc1_xcvr CONFIG.TX_OUT_DIV 1 diff --git a/projects/fmcomms11/common/fmcomms11_bd.tcl b/projects/fmcomms11/common/fmcomms11_bd.tcl index fec9d0e4d..9ed4be03b 100644 --- a/projects/fmcomms11/common/fmcomms11_bd.tcl +++ b/projects/fmcomms11/common/fmcomms11_bd.tcl @@ -53,7 +53,7 @@ ad_ip_parameter axi_ad9625_dma CONFIG.DMA_DATA_WIDTH_DEST 64 # shared transceiver core ad_ip_instance util_adxcvr util_fmcomms11_xcvr -ad_ip_parameter util_fmcomms11_xcvr CONFIG.QPLL_FBDIV "0100100000" +ad_ip_parameter util_fmcomms11_xcvr CONFIG.QPLL_FBDIV 0x120 ad_ip_parameter util_fmcomms11_xcvr CONFIG.CPLL_FBDIV 4 ad_ip_parameter util_fmcomms11_xcvr CONFIG.TX_NUM_OF_LANES 8 ad_ip_parameter util_fmcomms11_xcvr CONFIG.TX_CLK25_DIV 7