From 881808901584c5e66d9d73402cf9d372b107c764 Mon Sep 17 00:00:00 2001
From: Istvan Csomortani <istvan.csomortani@analog.com>
Date: Tue, 16 Apr 2019 08:28:29 +0100
Subject: [PATCH] a10soc: Reconfiguration interface address width improvement

The reconfiguration interface's address width is different in various
architectures. Define the required address width in system_qsys.tcl.
---
 projects/adrv9009/common/adrv9009_qsys.tcl    | 2 ++
 projects/adrv9371x/common/adrv9371x_qsys.tcl  | 1 +
 projects/common/a10gx/a10gx_system_qsys.tcl   | 3 +++
 projects/common/a10soc/a10soc_system_qsys.tcl | 4 ++++
 projects/daq2/common/daq2_qsys.tcl            | 1 +
 5 files changed, 11 insertions(+)

diff --git a/projects/adrv9009/common/adrv9009_qsys.tcl b/projects/adrv9009/common/adrv9009_qsys.tcl
index 156599096..b27465d77 100644
--- a/projects/adrv9009/common/adrv9009_qsys.tcl
+++ b/projects/adrv9009/common/adrv9009_qsys.tcl
@@ -276,6 +276,8 @@ for {set i 0} {$i < 4} {incr i} {
   add_connection sys_clk.clk_reset avl_adxcfg_${i}.rcfg_reset_n
   add_connection avl_adxcfg_${i}.rcfg_m0 adrv9009_tx_jesd204.phy_reconfig_${i}
 
+  set_instance_parameter_value avl_adxcfg_${i} {ADDRESS_WIDTH} $xcvr_reconfig_addr_width
+
   if {$i < 2} {
     add_connection avl_adxcfg_${i}.rcfg_m1 adrv9009_rx_jesd204.phy_reconfig_${i}
   } else {
diff --git a/projects/adrv9371x/common/adrv9371x_qsys.tcl b/projects/adrv9371x/common/adrv9371x_qsys.tcl
index b712cac6d..4707844bd 100644
--- a/projects/adrv9371x/common/adrv9371x_qsys.tcl
+++ b/projects/adrv9371x/common/adrv9371x_qsys.tcl
@@ -245,6 +245,7 @@ set_interface_property ad9371_gpio EXPORT_OF avl_ad9371_gpio.external_connection
 
 for {set i 0} {$i < 4} {incr i} {
   add_instance avl_adxcfg_${i} avl_adxcfg
+  set_instance_parameter_value avl_adxcfg_${i} {ADDRESS_WIDTH} $xcvr_reconfig_addr_width
   add_connection sys_clk.clk avl_adxcfg_${i}.rcfg_clk
   add_connection sys_clk.clk_reset avl_adxcfg_${i}.rcfg_reset_n
   add_connection avl_adxcfg_${i}.rcfg_m0 ad9371_tx_jesd204.phy_reconfig_${i}
diff --git a/projects/common/a10gx/a10gx_system_qsys.tcl b/projects/common/a10gx/a10gx_system_qsys.tcl
index 41afcbeba..c7a6ccd27 100644
--- a/projects/common/a10gx/a10gx_system_qsys.tcl
+++ b/projects/common/a10gx/a10gx_system_qsys.tcl
@@ -438,4 +438,7 @@ ad_cpu_interrupt 7 sys_spi.irq
 add_interface sys_flash conduit end
 set_interface_property sys_flash EXPORT_OF sys_flash_bridge.out
 
+# architecture specific global variables
+
+set xcvr_reconfig_addr_width 10
 
diff --git a/projects/common/a10soc/a10soc_system_qsys.tcl b/projects/common/a10soc/a10soc_system_qsys.tcl
index 031960108..e31591331 100644
--- a/projects/common/a10soc/a10soc_system_qsys.tcl
+++ b/projects/common/a10soc/a10soc_system_qsys.tcl
@@ -260,3 +260,7 @@ ad_cpu_interrupt 5 sys_gpio_in.irq
 ad_cpu_interrupt 6 sys_gpio_bd.irq
 ad_cpu_interrupt 7 sys_spi.irq
 
+# architecture specific global variables
+
+set xcvr_reconfig_addr_width 10
+
diff --git a/projects/daq2/common/daq2_qsys.tcl b/projects/daq2/common/daq2_qsys.tcl
index b7f894725..beb5ae0bc 100644
--- a/projects/daq2/common/daq2_qsys.tcl
+++ b/projects/daq2/common/daq2_qsys.tcl
@@ -196,6 +196,7 @@ add_connection sys_dma_clk.clk axi_ad9680_dma.m_dest_axi_clock
 
 for {set i 0} {$i < $TX_NUM_OF_LANES} {incr i} {
   add_instance avl_adxcfg_${i} avl_adxcfg
+  set_instance_parameter_value avl_adxcfg_${i} {ADDRESS_WIDTH} $xcvr_reconfig_addr_width
   add_connection sys_clk.clk avl_adxcfg_${i}.rcfg_clk
   add_connection sys_clk.clk_reset avl_adxcfg_${i}.rcfg_reset_n
   add_connection avl_adxcfg_${i}.rcfg_m0 ad9144_jesd204.phy_reconfig_${i}