diff --git a/applications/apertif/apertif_unb1_fn_beamformer/quartus/sopc_apertif_unb1_fn_beamformer.sopc b/applications/apertif/apertif_unb1_fn_beamformer/quartus/sopc_apertif_unb1_fn_beamformer.sopc
index 957b0cf9b0d587fcbc35ad406478b7e836eda16e..96f03ab19ba1b5f0590c75c258c3d5ed447adcc9 100644
--- a/applications/apertif/apertif_unb1_fn_beamformer/quartus/sopc_apertif_unb1_fn_beamformer.sopc
+++ b/applications/apertif/apertif_unb1_fn_beamformer/quartus/sopc_apertif_unb1_fn_beamformer.sopc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<system name="sopc_fn_beamformer">
+<system name="sopc_apertif_unb1_fn_beamformer">
<parameter name="bonusData"><![CDATA[bonusData
{
element altpll_0
@@ -22,7 +22,7 @@
{
datum _sortIndex
{
- value = "11";
+ value = "36";
type = "int";
}
}
@@ -100,47 +100,39 @@
type = "long";
}
}
- element reg_diag_bg.mem
- {
- datum baseAddress
- {
- value = "1344";
- type = "long";
- }
- }
- element reg_unb_sens.mem
+ element reg_tr_xaui.mem
{
datum baseAddress
{
- value = "1312";
+ value = "819200";
type = "long";
}
}
- element reg_dp_offload_tx_hdr_ovr.mem
+ element reg_bsn_monitor.mem
{
datum baseAddress
{
- value = "896";
+ value = "1088";
type = "long";
}
}
- element reg_dp_offload_tx.mem
+ element reg_dp_split.mem
{
datum baseAddress
{
- value = "1640";
+ value = "1408";
type = "long";
}
}
- element ram_diag_bg.mem
+ element reg_diag_bg.mem
{
datum baseAddress
{
- value = "32768";
+ value = "1344";
type = "long";
}
}
- element rom_system_info.mem
+ element pio_system_info.mem
{
datum _lockedAddress
{
@@ -149,100 +141,105 @@
}
datum baseAddress
{
- value = "4096";
+ value = "0";
type = "long";
}
}
- element reg_tr_xaui.mem
+ element reg_dp_pkt_merge.mem
{
datum baseAddress
{
- value = "819200";
+ value = "1440";
type = "long";
}
}
- element reg_mdio_2.mem
+ element reg_wdi.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "1536";
+ value = "12288";
type = "long";
}
}
- element reg_bsn_monitor.mem
+ element reg_diagnostics_mesh.mem
{
datum baseAddress
{
- value = "1152";
+ value = "256";
type = "long";
}
}
- element reg_mdio_0.mem
+ element reg_dp_offload_tx_hdr_ovr.mem
{
datum baseAddress
{
- value = "1472";
+ value = "896";
type = "long";
}
}
- element pio_system_info.mem
+ element reg_mdio_2.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "0";
+ value = "1536";
type = "long";
}
}
- element reg_tr_nonbonded_mesh.mem
+ element reg_dp_offload_tx.mem
{
datum baseAddress
{
- value = "1088";
+ value = "1640";
type = "long";
}
}
- element ram_bf_weights.mem
+ element reg_dp_offload_tx_hdr_dat.mem
{
datum baseAddress
{
- value = "262144";
+ value = "768";
type = "long";
}
}
- element ram_dp_ram_from_mm.mem
+ element reg_tr_nonbonded_mesh.mem
{
datum baseAddress
{
- value = "512";
+ value = "1024";
type = "long";
}
}
- element ram_diag_data_buffer.mem
+ element rom_system_info.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "65536";
+ value = "4096";
type = "long";
}
}
- element reg_mdio_1.mem
+ element reg_unb_sens.mem
{
datum baseAddress
{
- value = "1504";
+ value = "1312";
type = "long";
}
}
- element reg_diagnostics_mesh.mem
+ element reg_st_sst.mem
{
datum baseAddress
{
- value = "256";
+ value = "1152";
type = "long";
}
}
@@ -262,40 +259,43 @@
type = "long";
}
}
- element reg_dp_split.mem
+ element ram_bf_weights.mem
{
datum baseAddress
{
- value = "1408";
+ value = "262144";
type = "long";
}
}
- element reg_wdi.mem
+ element reg_mdio_1.mem
{
- datum _lockedAddress
+ datum baseAddress
{
- value = "1";
- type = "boolean";
+ value = "1504";
+ type = "long";
}
+ }
+ element ram_diag_bg.mem
+ {
datum baseAddress
{
- value = "12288";
+ value = "32768";
type = "long";
}
}
- element reg_dp_offload_tx_hdr_dat.mem
+ element ram_diag_data_buffer.mem
{
datum baseAddress
{
- value = "768";
+ value = "65536";
type = "long";
}
}
- element reg_st_sst.mem
+ element reg_diag_data_buffer.mem
{
datum baseAddress
{
- value = "1216";
+ value = "128";
type = "long";
}
}
@@ -307,19 +307,19 @@
type = "long";
}
}
- element reg_diag_data_buffer.mem
+ element reg_mdio_0.mem
{
datum baseAddress
{
- value = "128";
+ value = "1472";
type = "long";
}
}
- element reg_dp_pkt_merge.mem
+ element ram_dp_ram_from_mm.mem
{
datum baseAddress
{
- value = "1440";
+ value = "512";
type = "long";
}
}
@@ -335,7 +335,7 @@
{
datum baseAddress
{
- value = "1024";
+ value = "1216";
type = "long";
}
}
@@ -419,7 +419,7 @@
{
datum _sortIndex
{
- value = "18";
+ value = "17";
type = "int";
}
}
@@ -427,7 +427,7 @@
{
datum _sortIndex
{
- value = "21";
+ value = "20";
type = "int";
}
}
@@ -435,7 +435,7 @@
{
datum _sortIndex
{
- value = "15";
+ value = "14";
type = "int";
}
}
@@ -443,7 +443,7 @@
{
datum _sortIndex
{
- value = "24";
+ value = "23";
type = "int";
}
}
@@ -451,7 +451,7 @@
{
datum _sortIndex
{
- value = "20";
+ value = "19";
type = "int";
}
}
@@ -459,7 +459,7 @@
{
datum _sortIndex
{
- value = "19";
+ value = "18";
type = "int";
}
}
@@ -467,7 +467,7 @@
{
datum _sortIndex
{
- value = "16";
+ value = "15";
type = "int";
}
}
@@ -475,7 +475,7 @@
{
datum _sortIndex
{
- value = "22";
+ value = "21";
type = "int";
}
}
@@ -483,7 +483,7 @@
{
datum _sortIndex
{
- value = "25";
+ value = "24";
type = "int";
}
}
@@ -491,7 +491,7 @@
{
datum _sortIndex
{
- value = "14";
+ value = "13";
type = "int";
}
}
@@ -499,7 +499,7 @@
{
datum _sortIndex
{
- value = "31";
+ value = "30";
type = "int";
}
}
@@ -507,7 +507,7 @@
{
datum _sortIndex
{
- value = "29";
+ value = "28";
type = "int";
}
}
@@ -515,7 +515,7 @@
{
datum _sortIndex
{
- value = "30";
+ value = "29";
type = "int";
}
}
@@ -523,7 +523,7 @@
{
datum _sortIndex
{
- value = "28";
+ value = "27";
type = "int";
}
}
@@ -531,7 +531,7 @@
{
datum _sortIndex
{
- value = "23";
+ value = "22";
type = "int";
}
}
@@ -539,7 +539,7 @@
{
datum _sortIndex
{
- value = "26";
+ value = "25";
type = "int";
}
}
@@ -547,7 +547,7 @@
{
datum _sortIndex
{
- value = "34";
+ value = "33";
type = "int";
}
}
@@ -555,7 +555,7 @@
{
datum _sortIndex
{
- value = "35";
+ value = "34";
type = "int";
}
}
@@ -563,7 +563,7 @@
{
datum _sortIndex
{
- value = "36";
+ value = "35";
type = "int";
}
}
@@ -571,7 +571,7 @@
{
datum _sortIndex
{
- value = "27";
+ value = "26";
type = "int";
}
}
@@ -579,7 +579,7 @@
{
datum _sortIndex
{
- value = "32";
+ value = "31";
type = "int";
}
}
@@ -587,7 +587,7 @@
{
datum _sortIndex
{
- value = "13";
+ value = "12";
type = "int";
}
}
@@ -595,7 +595,7 @@
{
datum _sortIndex
{
- value = "33";
+ value = "32";
type = "int";
}
}
@@ -603,7 +603,7 @@
{
datum _sortIndex
{
- value = "12";
+ value = "11";
type = "int";
}
}
@@ -611,7 +611,7 @@
{
datum _sortIndex
{
- value = "17";
+ value = "16";
type = "int";
}
}
@@ -631,32 +631,32 @@
type = "long";
}
}
- element pio_wdi.s1
+ element timer_0.s1
{
- datum _lockedAddress
- {
- value = "0";
- type = "boolean";
- }
datum baseAddress
{
- value = "1600";
+ value = "1280";
type = "long";
}
}
- element timer_0.s1
+ element pio_pps.s1
{
datum baseAddress
{
- value = "1280";
+ value = "1616";
type = "long";
}
}
- element pio_pps.s1
+ element pio_wdi.s1
{
+ datum _lockedAddress
+ {
+ value = "0";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "1616";
+ value = "1600";
type = "long";
}
}
@@ -673,7 +673,7 @@
type = "long";
}
}
- element sopc_fn_beamformer
+ element sopc_apertif_unb1_fn_beamformer
{
}
element timer_0
@@ -701,10 +701,10 @@
<parameter name="globalResetBus" value="true" />
<parameter name="hdlLanguage" value="VHDL" />
<parameter name="maxAdditionalLatency" value="0" />
- <parameter name="projectName" value="fn_beamformer.qpf" />
+ <parameter name="projectName">apertif_unb1_fn_beamformer.qpf</parameter>
<parameter name="sopcBorderPoints" value="true" />
- <parameter name="systemHash" value="-68949126003" />
- <parameter name="timeStamp" value="1404726360711" />
+ <parameter name="systemHash" value="-65806922615" />
+ <parameter name="timeStamp" value="1424102236746" />
<parameter name="useTestBenchNamingPattern" value="false" />
<module kind="clock_source" version="11.1" enabled="1" name="clk_0">
<parameter name="clockFrequency" value="25000000" />
@@ -805,7 +805,7 @@
<parameter name="dcache_numTCDM" value="_0" />
<parameter name="dcache_lineSize" value="_32" />
<parameter name="dcache_bursts" value="false" />
- <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer.mem' start='0x80' end='0x100' /><slave name='reg_diagnostics_mesh.mem' start='0x100' end='0x200' /><slave name='ram_dp_ram_from_mm.mem' start='0x200' end='0x300' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x300' end='0x380' /><slave name='reg_dp_offload_tx_hdr_ovr.mem' start='0x380' end='0x400' /><slave name='avs_eth_0.mms_reg' start='0x400' end='0x440' /><slave name='reg_tr_nonbonded_mesh.mem' start='0x440' end='0x480' /><slave name='reg_bsn_monitor.mem' start='0x480' end='0x4C0' /><slave name='reg_st_sst.mem' start='0x4C0' end='0x500' /><slave name='timer_0.s1' start='0x500' end='0x520' /><slave name='reg_unb_sens.mem' start='0x520' end='0x540' /><slave name='reg_diag_bg.mem' start='0x540' end='0x560' /><slave name='reg_dp_ram_from_mm.mem' start='0x560' end='0x580' /><slave name='reg_dp_split.mem' start='0x580' end='0x5A0' /><slave name='reg_dp_pkt_merge.mem' start='0x5A0' end='0x5C0' /><slave name='reg_mdio_0.mem' start='0x5C0' end='0x5E0' /><slave name='reg_mdio_1.mem' start='0x5E0' end='0x600' /><slave name='reg_mdio_2.mem' start='0x600' end='0x620' /><slave name='altpll_0.pll_slave' start='0x620' end='0x630' /><slave name='pio_debug_wave.s1' start='0x630' end='0x640' /><slave name='pio_wdi.s1' start='0x640' end='0x650' /><slave name='pio_pps.s1' start='0x650' end='0x660' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x660' end='0x668' /><slave name='reg_dp_offload_tx.mem' start='0x668' end='0x670' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='ram_st_sst.mem' start='0x4000' end='0x8000' /><slave name='ram_diag_bg.mem' start='0x8000' end='0x10000' /><slave name='ram_diag_data_buffer.mem' start='0x10000' end='0x20000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_bf_weights.mem' start='0x40000' end='0x80000' /><slave name='ram_ss_ss_wide.mem' start='0x80000' end='0xC0000' /><slave name='reg_tr_10GbE.mem' start='0xC0000' end='0xC8000' /><slave name='reg_tr_xaui.mem' start='0xC8000' end='0xCA000' /><slave name='avs_eth_0.mms_ram' start='0xCA000' end='0xCB000' /></address-map>]]></parameter>
+ <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer.mem' start='0x80' end='0x100' /><slave name='reg_diagnostics_mesh.mem' start='0x100' end='0x200' /><slave name='ram_dp_ram_from_mm.mem' start='0x200' end='0x300' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x300' end='0x380' /><slave name='reg_dp_offload_tx_hdr_ovr.mem' start='0x380' end='0x400' /><slave name='reg_tr_nonbonded_mesh.mem' start='0x400' end='0x440' /><slave name='reg_bsn_monitor.mem' start='0x440' end='0x480' /><slave name='reg_st_sst.mem' start='0x480' end='0x4C0' /><slave name='avs_eth_0.mms_reg' start='0x4C0' end='0x500' /><slave name='timer_0.s1' start='0x500' end='0x520' /><slave name='reg_unb_sens.mem' start='0x520' end='0x540' /><slave name='reg_diag_bg.mem' start='0x540' end='0x560' /><slave name='reg_dp_ram_from_mm.mem' start='0x560' end='0x580' /><slave name='reg_dp_split.mem' start='0x580' end='0x5A0' /><slave name='reg_dp_pkt_merge.mem' start='0x5A0' end='0x5C0' /><slave name='reg_mdio_0.mem' start='0x5C0' end='0x5E0' /><slave name='reg_mdio_1.mem' start='0x5E0' end='0x600' /><slave name='reg_mdio_2.mem' start='0x600' end='0x620' /><slave name='altpll_0.pll_slave' start='0x620' end='0x630' /><slave name='pio_debug_wave.s1' start='0x630' end='0x640' /><slave name='pio_wdi.s1' start='0x640' end='0x650' /><slave name='pio_pps.s1' start='0x650' end='0x660' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x660' end='0x668' /><slave name='reg_dp_offload_tx.mem' start='0x668' end='0x670' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='ram_st_sst.mem' start='0x4000' end='0x8000' /><slave name='ram_diag_bg.mem' start='0x8000' end='0x10000' /><slave name='ram_diag_data_buffer.mem' start='0x10000' end='0x20000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_bf_weights.mem' start='0x40000' end='0x80000' /><slave name='ram_ss_ss_wide.mem' start='0x80000' end='0xC0000' /><slave name='reg_tr_10GbE.mem' start='0xC0000' end='0xC8000' /><slave name='reg_tr_xaui.mem' start='0xC8000' end='0xCA000' /><slave name='avs_eth_0.mms_ram' start='0xCA000' end='0xCB000' /></address-map>]]></parameter>
<parameter name="dataAddrWidth" value="20" />
<parameter name="customInstSlavesSystemInfo" value="<info/>" />
<parameter name="cpuReset" value="false" />
@@ -1068,9 +1068,6 @@ q]]></parameter>
<parameter name="simDrivenValue" value="0" />
<parameter name="width" value="1" />
</module>
- <module kind="avs_eth_coe" version="1.0" enabled="1" name="avs_eth_0">
- <parameter name="AUTO_MM_CLOCK_RATE" value="50000000" />
- </module>
<module kind="altera_avalon_pio" version="11.1" enabled="1" name="pio_pps">
<parameter name="bitClearingEdgeCapReg" value="false" />
<parameter name="bitModifyingOutReg" value="false" />
@@ -1268,6 +1265,9 @@ q]]></parameter>
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
+ <module kind="avs2_eth_coe" version="1.0" enabled="1" name="avs_eth_0">
+ <parameter name="AUTO_MM_CLOCK_RATE" value="50000000" />
+ </module>
<connection
kind="avalon"
version="11.1"
@@ -1369,38 +1369,6 @@ q]]></parameter>
version="11.1"
start="altpll_0.c0"
end="onchip_memory2_0.clk1" />
- <connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_tse">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x2000" />
- </connection>
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_reg">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0400" />
- </connection>
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_ram">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x000ca000" />
- </connection>
- <connection
- kind="interrupt"
- version="11.1"
- start="cpu_0.d_irq"
- end="avs_eth_0.interrupt">
- <parameter name="irqNumber" value="2" />
- </connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="pio_pps.clk" />
<connection
kind="avalon"
@@ -1434,7 +1402,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_tr_nonbonded_mesh.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0440" />
+ <parameter name="baseAddress" value="0x0400" />
</connection>
<connection
kind="clock"
@@ -1499,7 +1467,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_bsn_monitor.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0480" />
+ <parameter name="baseAddress" value="0x0440" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="reg_wdi.system" />
<connection
@@ -1638,7 +1606,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_st_sst.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x04c0" />
+ <parameter name="baseAddress" value="0x0480" />
</connection>
<connection
kind="clock"
@@ -1757,4 +1725,36 @@ q]]></parameter>
<parameter name="arbitrationPriority" value="1" />
<parameter name="baseAddress" value="0x0600" />
</connection>
+ <connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_tse">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x2000" />
+ </connection>
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_reg">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x04c0" />
+ </connection>
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_ram">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x000ca000" />
+ </connection>
+ <connection
+ kind="interrupt"
+ version="11.1"
+ start="cpu_0.d_irq"
+ end="avs_eth_0.interrupt">
+ <parameter name="irqNumber" value="2" />
+ </connection>
</system>