diff --git a/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc b/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
index c8983039c950b8970e0ea597f44ec0545f0a40d6..3894062067aad035fd0b3b945ca5e9b0fb7a5474 100644
--- a/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
+++ b/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
@@ -84,23 +84,15 @@
type = "String";
}
}
- element ram_diag_data_buffer_im.mem
- {
- datum baseAddress
- {
- value = "16384";
- type = "long";
- }
- }
- element ram_diag_bg.mem
+ element reg_diag_bg.mem
{
datum baseAddress
{
- value = "49152";
+ value = "640";
type = "long";
}
}
- element pio_system_info.mem
+ element rom_system_info.mem
{
datum _lockedAddress
{
@@ -109,60 +101,65 @@
}
datum baseAddress
{
- value = "0";
+ value = "4096";
type = "long";
}
}
- element reg_diag_bg.mem
+ element ram_diag_data_buffer_re.mem
{
datum baseAddress
{
- value = "640";
+ value = "65536";
type = "long";
}
}
- element reg_bsn_monitor.mem
+ element reg_wdi.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "384";
+ value = "12288";
type = "long";
}
}
- element reg_diag_data_buffer_re.mem
+ element pio_system_info.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "256";
+ value = "0";
type = "long";
}
}
- element reg_unb_sens.mem
+ element ram_diag_bg.mem
{
datum baseAddress
{
- value = "608";
+ value = "16384";
type = "long";
}
}
- element rom_system_info.mem
+ element reg_unb_sens.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "4096";
+ value = "608";
type = "long";
}
}
- element pio_pps.mem
+ element reg_diag_data_buffer_im.mem
{
datum baseAddress
{
- value = "728";
+ value = "128";
type = "long";
}
}
@@ -170,11 +167,11 @@
{
datum baseAddress
{
- value = "65536";
+ value = "98304";
type = "long";
}
}
- element ram_diag_data_buffer_re.mem
+ element ram_diag_data_buffer_im.mem
{
datum baseAddress
{
@@ -182,24 +179,27 @@
type = "long";
}
}
- element reg_diag_data_buffer_im.mem
+ element reg_diag_data_buffer_re.mem
{
datum baseAddress
{
- value = "128";
+ value = "256";
type = "long";
}
}
- element reg_wdi.mem
+ element pio_pps.mem
{
- datum _lockedAddress
+ datum baseAddress
{
- value = "1";
- type = "boolean";
+ value = "728";
+ type = "long";
}
+ }
+ element reg_bsn_monitor.mem
+ {
datum baseAddress
{
- value = "12288";
+ value = "384";
type = "long";
}
}
@@ -207,7 +207,7 @@
{
datum baseAddress
{
- value = "81920";
+ value = "262144";
type = "long";
}
}
@@ -378,6 +378,14 @@
type = "int";
}
}
+ element pio_wdi.s1
+ {
+ datum baseAddress
+ {
+ value = "704";
+ type = "long";
+ }
+ }
element onchip_memory2_0.s1
{
datum _lockedAddress
@@ -399,14 +407,6 @@
type = "long";
}
}
- element pio_wdi.s1
- {
- datum baseAddress
- {
- value = "704";
- type = "long";
- }
- }
element timer_0.s1
{
datum baseAddress
@@ -440,8 +440,8 @@
<parameter name="maxAdditionalLatency" value="0" />
<parameter name="projectName" value="unb1_reorder.qpf" />
<parameter name="sopcBorderPoints" value="true" />
- <parameter name="systemHash" value="-54033115722" />
- <parameter name="timeStamp" value="1426159375732" />
+ <parameter name="systemHash" value="-53152866803" />
+ <parameter name="timeStamp" value="1426861872307" />
<parameter name="useTestBenchNamingPattern" value="false" />
<module kind="clock_source" version="11.1" enabled="1" name="clk_0">
<parameter name="clockFrequency" value="25000000" />
@@ -542,8 +542,8 @@
<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_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='reg_bsn_monitor.mem' start='0x180' end='0x200' /><slave name='avs_eth_0.mms_reg' start='0x200' end='0x240' /><slave name='timer_0.s1' start='0x240' end='0x260' /><slave name='reg_unb_sens.mem' start='0x260' end='0x280' /><slave name='reg_diag_bg.mem' start='0x280' end='0x2A0' /><slave name='altpll_0.pll_slave' start='0x2A0' end='0x2B0' /><slave name='pio_debug_wave.s1' start='0x2B0' end='0x2C0' /><slave name='pio_wdi.s1' start='0x2C0' end='0x2D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x2D0' end='0x2D8' /><slave name='pio_pps.mem' start='0x2D8' end='0x2E0' /><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_diag_data_buffer_im.mem' start='0x4000' end='0x8000' /><slave name='ram_diag_data_buffer_re.mem' start='0x8000' end='0xC000' /><slave name='ram_diag_bg.mem' start='0xC000' end='0x10000' /><slave name='ram_ss_ss_wide.mem' start='0x10000' end='0x14000' /><slave name='avs_eth_0.mms_ram' start='0x14000' end='0x15000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter>
- <parameter name="dataAddrWidth" value="18" />
+ <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='reg_bsn_monitor.mem' start='0x180' end='0x200' /><slave name='avs_eth_0.mms_reg' start='0x200' end='0x240' /><slave name='timer_0.s1' start='0x240' end='0x260' /><slave name='reg_unb_sens.mem' start='0x260' end='0x280' /><slave name='reg_diag_bg.mem' start='0x280' end='0x2A0' /><slave name='altpll_0.pll_slave' start='0x2A0' end='0x2B0' /><slave name='pio_debug_wave.s1' start='0x2B0' end='0x2C0' /><slave name='pio_wdi.s1' start='0x2C0' end='0x2D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x2D0' end='0x2D8' /><slave name='pio_pps.mem' start='0x2D8' end='0x2E0' /><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_diag_bg.mem' start='0x4000' end='0x8000' /><slave name='ram_diag_data_buffer_im.mem' start='0x8000' end='0x10000' /><slave name='ram_diag_data_buffer_re.mem' start='0x10000' end='0x18000' /><slave name='ram_ss_ss_wide.mem' start='0x18000' end='0x20000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='avs_eth_0.mms_ram' start='0x40000' end='0x41000' /></address-map>]]></parameter>
+ <parameter name="dataAddrWidth" value="19" />
<parameter name="customInstSlavesSystemInfo" value="<info/>" />
<parameter name="cpuReset" value="false" />
<parameter name="cpuID" value="0" />
@@ -858,7 +858,7 @@ q]]></parameter>
version="1.0"
enabled="1"
name="ram_diag_data_buffer_im">
- <parameter name="g_adr_w" value="12" />
+ <parameter name="g_adr_w" value="13" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
@@ -867,7 +867,7 @@ q]]></parameter>
version="1.0"
enabled="1"
name="ram_diag_data_buffer_re">
- <parameter name="g_adr_w" value="12" />
+ <parameter name="g_adr_w" value="13" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
@@ -877,7 +877,7 @@ q]]></parameter>
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
<module kind="avs_common_mm" version="1.0" enabled="1" name="ram_ss_ss_wide">
- <parameter name="g_adr_w" value="12" />
+ <parameter name="g_adr_w" value="13" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
@@ -1097,7 +1097,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_diag_data_buffer_im.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x4000" />
+ <parameter name="baseAddress" value="0x8000" />
</connection>
<connection
kind="clock"
@@ -1110,7 +1110,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_diag_data_buffer_re.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x8000" />
+ <parameter name="baseAddress" value="0x00010000" />
</connection>
<connection
kind="clock"
@@ -1123,7 +1123,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_diag_bg.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0xc000" />
+ <parameter name="baseAddress" value="0x4000" />
</connection>
<connection
kind="clock"
@@ -1136,7 +1136,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_ss_ss_wide.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x00010000" />
+ <parameter name="baseAddress" value="0x00018000" />
</connection>
<connection
kind="clock"
@@ -1174,7 +1174,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="avs_eth_0.mms_ram">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x00014000" />
+ <parameter name="baseAddress" value="0x00040000" />
</connection>
<connection
kind="interrupt"