diff --git a/projects/daq3/a10gx/system_bd.qsys b/projects/daq3/a10gx/system_bd.qsys
index 94756fbd1..ec6989ffe 100755
--- a/projects/daq3/a10gx/system_bd.qsys
+++ b/projects/daq3/a10gx/system_bd.qsys
@@ -9,14 +9,6 @@
categories="System" />
-
+
@@ -426,14 +466,14 @@
type="reset"
dir="end" />
-
+
- ]]>
+ ]]>
@@ -445,15 +485,15 @@
$${FILENAME}_a10gx_base
- ]]>
+ ]]>
- ]]>
+ ]]>
-
+
@@ -471,7 +511,7 @@
-
+
@@ -479,7 +519,7 @@
@@ -488,7 +528,7 @@
@@ -497,7 +537,7 @@
@@ -506,16 +546,16 @@
-
+
@@ -524,16 +564,16 @@
-
+
@@ -541,43 +581,97 @@
-
+ kind="avalon"
+ version="15.1"
+ start="a10gx_base.sys_cpu_m_avl"
+ end="daq3.xcvr_core_jesd204_rx_s_avl">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/projects/daq3/a10gx/system_constr.sdc b/projects/daq3/a10gx/system_constr.sdc
index 86ef79f85..409f353e1 100644
--- a/projects/daq3/a10gx/system_constr.sdc
+++ b/projects/daq3/a10gx/system_constr.sdc
@@ -14,3 +14,30 @@ set_false_path -from [get_clocks {sys_clk_100mhz}] -to [get_clocks {\
i_system_bd|a10gx_base|sys_ddr3_cntrl_phy_clk_l_1 \
i_system_bd|a10gx_base|sys_ddr3_cntrl_phy_clk_l_2}]
+set_false_path -from [get_clocks {sys_clk_100mhz}] -to [get_clocks {\
+ i_system_bd|a10gx_base|sys_ddr3_cntrl_core_nios_clk}]
+
+set_false_path -from [get_clocks {sys_clk_100mhz}]\
+ -through [get_nets *altera_jesd204_tx_csr_inst*]\
+ -to [get_clocks {i_system_bd|daq3|xcvr_tx_pll|outclk0}]
+
+set_false_path -from [get_clocks {sys_clk_100mhz}]\
+ -through [get_nets *altera_jesd204_tx_ctl_inst*]\
+ -to [get_clocks {i_system_bd|daq3|xcvr_tx_pll|outclk0}]
+
+set_false_path -from [get_clocks {sys_clk_100mhz}]\
+ -through [get_nets *altera_jesd204_rx_csr_inst*]\
+ -to [get_clocks {i_system_bd|daq3|xcvr_rx_pll|outclk0}]
+
+set_false_path -from [get_clocks {i_system_bd|daq3|xcvr_tx_pll|outclk0}]\
+ -through [get_nets *altera_jesd204_tx_csr_inst*]\
+ -to [get_clocks {sys_clk_100mhz}]
+
+set_false_path -from [get_clocks {i_system_bd|daq3|xcvr_tx_pll|outclk0}]\
+ -through [get_nets *altera_jesd204_tx_ctl_inst*]\
+ -to [get_clocks {sys_clk_100mhz}]
+
+set_false_path -from [get_clocks {i_system_bd|daq3|xcvr_rx_pll|outclk0}]\
+ -through [get_nets *altera_jesd204_rx_csr_inst*]\
+ -to [get_clocks {sys_clk_100mhz}]
+
diff --git a/projects/daq3/a10gx/system_top.v b/projects/daq3/a10gx/system_top.v
index 8524d6ead..c04de0cac 100644
--- a/projects/daq3/a10gx/system_top.v
+++ b/projects/daq3/a10gx/system_top.v
@@ -147,8 +147,8 @@ module system_top (
// board gpio
- inout [ 10:0] gpio_bd_i;
- inout [ 15:0] gpio_bd_o;
+ input [ 10:0] gpio_bd_i;
+ output [ 15:0] gpio_bd_o;
// lane interface
@@ -209,11 +209,11 @@ module system_top (
// gpio in & out are separate cores
- assign sysref = gpio_o[36];
- assign adc_pd = gpio_o[35];
- assign dac_txen = gpio_o[34];
+ assign sysref = gpio_o[43];
+ assign adc_pd = gpio_o[42];
+ assign dac_txen = gpio_o[41];
- assign gpio_i[63:38] = 26'd0;
+ assign gpio_i[63:38] = gpio_o[63:38];
assign gpio_i[37:37] = trig;
assign gpio_i[36:36] = adc_fdb;
assign gpio_i[35:35] = adc_fda;
diff --git a/projects/daq3/common/daq3_bd.qsys b/projects/daq3/common/daq3_bd.qsys
index 9e7961940..50888360b 100755
--- a/projects/daq3/common/daq3_bd.qsys
+++ b/projects/daq3/common/daq3_bd.qsys
@@ -13,7 +13,7 @@
{
datum _sortIndex
{
- value = "9";
+ value = "11";
type = "int";
}
}
@@ -21,7 +21,7 @@
{
datum _sortIndex
{
- value = "14";
+ value = "16";
type = "int";
}
}
@@ -37,7 +37,7 @@
{
datum _sortIndex
{
- value = "12";
+ value = "14";
type = "int";
}
}
@@ -53,7 +53,7 @@
{
datum _sortIndex
{
- value = "11";
+ value = "13";
type = "int";
}
}
@@ -69,7 +69,7 @@
{
datum _sortIndex
{
- value = "8";
+ value = "10";
type = "int";
}
datum sopceditor_expanded
@@ -90,7 +90,7 @@
{
datum _sortIndex
{
- value = "15";
+ value = "17";
type = "int";
}
}
@@ -406,14 +406,6 @@
type = "String";
}
}
- element daq3_bd
- {
- datum _originalDeviceFamily
- {
- value = "Arria 10";
- type = "String";
- }
- }
element mem_clk
{
datum _sortIndex
@@ -650,7 +642,7 @@
{
datum _sortIndex
{
- value = "10";
+ value = "12";
type = "int";
}
}
@@ -658,7 +650,7 @@
{
datum _sortIndex
{
- value = "13";
+ value = "15";
type = "int";
}
}
@@ -666,7 +658,7 @@
{
datum _sortIndex
{
- value = "18";
+ value = "20";
type = "int";
}
}
@@ -674,7 +666,7 @@
{
datum _sortIndex
{
- value = "16";
+ value = "18";
type = "int";
}
}
@@ -682,7 +674,15 @@
{
datum _sortIndex
{
- value = "7";
+ value = "8";
+ type = "int";
+ }
+ }
+ element xcvr_rx_pll_reconfig
+ {
+ datum _sortIndex
+ {
+ value = "9";
type = "int";
}
}
@@ -690,7 +690,7 @@
{
datum _sortIndex
{
- value = "6";
+ value = "7";
type = "int";
}
}
@@ -698,7 +698,7 @@
{
datum _sortIndex
{
- value = "17";
+ value = "19";
type = "int";
}
}
@@ -710,6 +710,14 @@
type = "int";
}
}
+ element xcvr_tx_pll_reconfig
+ {
+ datum _sortIndex
+ {
+ value = "6";
+ type = "int";
+ }
+ }
element xcvr_tx_ref_clk
{
datum _sortIndex
@@ -829,6 +837,36 @@
internal="axi_jesd_xcvr.if_tx_ext_sysref_in"
type="conduit"
dir="end" />
+
+
+
+
+
+
@@ -966,12 +1004,12 @@
-
+
-
-
+
+
@@ -994,10 +1032,10 @@
-
+
-
-
+
+
@@ -1181,7 +1219,7 @@
-
+
@@ -1287,6 +1325,16 @@
+
+
+
+
+
+
-
+
@@ -1322,7 +1370,7 @@
-
+
@@ -1342,7 +1390,7 @@
-
+
@@ -1350,16 +1398,16 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
@@ -1544,7 +1592,7 @@
-
+
@@ -1650,6 +1698,16 @@
+
+
+
+
+
+
+
+
+
+
+ start="axi_ad9680_core.adc_ch_0"
+ end="util_cpack_0.adc_ch_0">
@@ -1815,8 +1893,8 @@
+ start="axi_ad9680_core.adc_ch_1"
+ end="util_cpack_0.adc_ch_1">
@@ -1837,8 +1915,8 @@
+ start="axi_ad9152_core.dac_ch_0"
+ end="util_upack_0.dac_ch_0">
@@ -1889,17 +1967,6 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+ start="xcvr_tx_lane_pll.pll_cal_busy"
+ end="xcvr_rst_cntrl.pll_cal_busy">
@@ -2079,8 +2146,52 @@
+ start="xcvr_rst_cntrl.pll_powerdown"
+ end="xcvr_tx_lane_pll.pll_powerdown">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2178,8 +2289,19 @@
+ start="xcvr_core.tx_digitalreset"
+ end="xcvr_rst_cntrl.tx_digitalreset">
+
+
+
+
+
+
+
@@ -2275,7 +2397,22 @@
kind="reset"
version="15.1"
start="sys_rst.out_reset"
- end="xcvr_rst_cntrl.reset" />
+ end="xcvr_tx_pll_reconfig.mgmt_reset" />
+
+
+
+