diff --git a/boards/uniboard1/designs/unb1_ddr3/quartus/sopc_unb1_ddr3.sopc b/boards/uniboard1/designs/unb1_ddr3/quartus/sopc_unb1_ddr3.sopc
index 4b89b8b50312bfdfc848b72b4ed5dcc4ca2db438..7e1839f5025ca07c10bf920c4f8c146b19b93e1f 100644
--- a/boards/uniboard1/designs/unb1_ddr3/quartus/sopc_unb1_ddr3.sopc
+++ b/boards/uniboard1/designs/unb1_ddr3/quartus/sopc_unb1_ddr3.sopc
@@ -14,7 +14,7 @@
{
datum baseAddress
{
- value = "896";
+ value = "624";
type = "long";
}
}
@@ -22,7 +22,7 @@
{
datum _sortIndex
{
- value = "11";
+ value = "10";
type = "int";
}
}
@@ -92,14 +92,6 @@
type = "String";
}
}
- element reg_unb_sens.mem
- {
- datum baseAddress
- {
- value = "224";
- type = "long";
- }
- }
element reg_wdi.mem
{
datum _lockedAddress
@@ -113,6 +105,14 @@
type = "long";
}
}
+ element reg_diagnostics.mem
+ {
+ datum baseAddress
+ {
+ value = "256";
+ type = "long";
+ }
+ }
element pio_system_info.mem
{
datum _lockedAddress
@@ -126,48 +126,40 @@
type = "long";
}
}
- element reg_ddr3_1.mem
+ element reg_io_ddr.mem
{
datum baseAddress
{
- value = "768";
+ value = "128";
type = "long";
}
}
- element reg_diagnostics_0.mem
+ element rom_system_info.mem
{
- datum baseAddress
+ datum _lockedAddress
{
- value = "256";
- type = "long";
+ value = "1";
+ type = "boolean";
}
- }
- element reg_ddr3_0.mem
- {
datum baseAddress
{
- value = "800";
+ value = "4096";
type = "long";
}
}
- element reg_diagnostics_1.mem
+ element pio_pps.mem
{
datum baseAddress
{
- value = "512";
+ value = "632";
type = "long";
}
}
- element rom_system_info.mem
+ element reg_unb_sens.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "4096";
+ value = "544";
type = "long";
}
}
@@ -183,7 +175,7 @@
{
datum baseAddress
{
- value = "128";
+ value = "192";
type = "long";
}
}
@@ -225,7 +217,7 @@
{
datum _sortIndex
{
- value = "10";
+ value = "15";
type = "int";
}
}
@@ -259,19 +251,19 @@
}
datum baseAddress
{
- value = "832";
+ value = "576";
type = "long";
}
}
- element reg_ddr3_0
+ element reg_diagnostics
{
datum _sortIndex
{
- value = "17";
+ value = "13";
type = "int";
}
}
- element reg_ddr3_1
+ element reg_io_ddr
{
datum _sortIndex
{
@@ -279,23 +271,15 @@
type = "int";
}
}
- element reg_diagnostics_0
- {
- datum _sortIndex
- {
- value = "15";
- type = "int";
- }
- }
- element reg_diagnostics_1
+ element reg_unb_sens
{
datum _sortIndex
{
- value = "16";
+ value = "11";
type = "int";
}
}
- element reg_unb_sens
+ element reg_wdi
{
datum _sortIndex
{
@@ -303,27 +287,27 @@
type = "int";
}
}
- element reg_wdi
+ element rom_system_info
{
datum _sortIndex
{
- value = "13";
+ value = "7";
type = "int";
}
}
- element rom_system_info
+ element timer_0.s1
{
- datum _sortIndex
+ datum baseAddress
{
- value = "7";
- type = "int";
+ value = "512";
+ type = "long";
}
}
element pio_debug_wave.s1
{
datum baseAddress
{
- value = "848";
+ value = "592";
type = "long";
}
}
@@ -349,23 +333,7 @@
}
datum baseAddress
{
- value = "864";
- type = "long";
- }
- }
- element pio_pps.s1
- {
- datum baseAddress
- {
- value = "880";
- type = "long";
- }
- }
- element timer_0.s1
- {
- datum baseAddress
- {
- value = "192";
+ value = "608";
type = "long";
}
}
@@ -399,8 +367,8 @@
<parameter name="maxAdditionalLatency" value="0" />
<parameter name="projectName" value="unb1_ddr3.qpf" />
<parameter name="sopcBorderPoints" value="true" />
- <parameter name="systemHash" value="-13116425773" />
- <parameter name="timeStamp" value="1414492111097" />
+ <parameter name="systemHash" value="-16998712230" />
+ <parameter name="timeStamp" value="1429015105056" />
<parameter name="useTestBenchNamingPattern" value="false" />
<module kind="clock_source" version="11.1" enabled="1" name="clk_0">
<parameter name="clockFrequency" value="25000000" />
@@ -501,7 +469,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='avs_eth_0.mms_reg' start='0x80' end='0xC0' /><slave name='timer_0.s1' start='0xC0' end='0xE0' /><slave name='reg_unb_sens.mem' start='0xE0' end='0x100' /><slave name='reg_diagnostics_0.mem' start='0x100' end='0x200' /><slave name='reg_diagnostics_1.mem' start='0x200' end='0x300' /><slave name='reg_ddr3_1.mem' start='0x300' end='0x320' /><slave name='reg_ddr3_0.mem' start='0x320' end='0x340' /><slave name='altpll_0.pll_slave' start='0x340' end='0x350' /><slave name='pio_debug_wave.s1' start='0x350' end='0x360' /><slave name='pio_wdi.s1' start='0x360' end='0x370' /><slave name='pio_pps.s1' start='0x370' end='0x380' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x380' end='0x388' /><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='avs_eth_0.mms_ram' start='0x4000' end='0x5000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter>
+ <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_io_ddr.mem' start='0x80' end='0xC0' /><slave name='avs_eth_0.mms_reg' start='0xC0' end='0x100' /><slave name='reg_diagnostics.mem' start='0x100' end='0x200' /><slave name='timer_0.s1' start='0x200' end='0x220' /><slave name='reg_unb_sens.mem' start='0x220' end='0x240' /><slave name='altpll_0.pll_slave' start='0x240' end='0x250' /><slave name='pio_debug_wave.s1' start='0x250' end='0x260' /><slave name='pio_wdi.s1' start='0x260' end='0x270' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x270' end='0x278' /><slave name='pio_pps.mem' start='0x278' end='0x280' /><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='avs_eth_0.mms_ram' start='0x4000' end='0x5000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter>
<parameter name="dataAddrWidth" value="18" />
<parameter name="customInstSlavesSystemInfo" value="<info/>" />
<parameter name="cpuReset" value="false" />
@@ -764,20 +732,6 @@ q]]></parameter>
<parameter name="simDrivenValue" value="0" />
<parameter name="width" value="1" />
</module>
- <module kind="altera_avalon_pio" version="11.1" enabled="1" name="pio_pps">
- <parameter name="bitClearingEdgeCapReg" value="false" />
- <parameter name="bitModifyingOutReg" value="false" />
- <parameter name="captureEdge" value="false" />
- <parameter name="clockRate" value="50000000" />
- <parameter name="direction" value="Input" />
- <parameter name="edgeType" value="RISING" />
- <parameter name="generateIRQ" value="false" />
- <parameter name="irqType" value="LEVEL" />
- <parameter name="resetValue" value="0" />
- <parameter name="simDoTestBenchWiring" value="false" />
- <parameter name="simDrivenValue" value="0" />
- <parameter name="width" value="32" />
- </module>
<module kind="avs_common_mm" version="1.0" enabled="1" name="reg_unb_sens">
<parameter name="g_adr_w" value="3" />
<parameter name="g_dat_w" value="32" />
@@ -798,37 +752,24 @@ q]]></parameter>
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
- <module kind="avs_common_mm" version="1.0" enabled="1" name="reg_ddr3_1">
- <parameter name="g_adr_w" value="3" />
- <parameter name="g_dat_w" value="32" />
- <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
- </module>
- <module
- kind="avs_common_mm"
- version="1.0"
- enabled="1"
- name="reg_diagnostics_0">
- <parameter name="g_adr_w" value="6" />
- <parameter name="g_dat_w" value="32" />
- <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
- </module>
- <module
- kind="avs_common_mm"
- version="1.0"
- enabled="1"
- name="reg_diagnostics_1">
+ <module kind="avs_common_mm" version="1.0" enabled="1" name="reg_diagnostics">
<parameter name="g_adr_w" value="6" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
- <module kind="avs_common_mm" version="1.0" enabled="1" name="reg_ddr3_0">
- <parameter name="g_adr_w" value="3" />
+ <module kind="avs_common_mm" version="1.0" enabled="1" name="reg_io_ddr">
+ <parameter name="g_adr_w" value="4" />
<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>
+ <module kind="avs_common_mm" version="1.0" enabled="1" name="pio_pps">
+ <parameter name="g_adr_w" value="1" />
+ <parameter name="g_dat_w" value="32" />
+ <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
+ </module>
<connection
kind="avalon"
version="11.1"
@@ -867,7 +808,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="jtag_uart_0.avalon_jtag_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0380" />
+ <parameter name="baseAddress" value="0x0270" />
</connection>
<connection
kind="interrupt"
@@ -882,7 +823,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="altpll_0.pll_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0340" />
+ <parameter name="baseAddress" value="0x0240" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="cpu_0.clk" />
<connection kind="clock" version="11.1" start="altpll_0.c0" end="jtag_uart_0.clk" />
@@ -902,7 +843,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_debug_wave.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0350" />
+ <parameter name="baseAddress" value="0x0250" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="timer_0.clk" />
<connection
@@ -911,7 +852,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="timer_0.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x00c0" />
+ <parameter name="baseAddress" value="0x0200" />
</connection>
<connection kind="interrupt" version="11.1" start="cpu_0.d_irq" end="timer_0.irq">
<parameter name="irqNumber" value="1" />
@@ -923,22 +864,13 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_wdi.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0360" />
+ <parameter name="baseAddress" value="0x0260" />
</connection>
<connection
kind="clock"
version="11.1"
start="altpll_0.c0"
end="onchip_memory2_0.clk1" />
- <connection kind="clock" version="11.1" start="altpll_0.c0" end="pio_pps.clk" />
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="pio_pps.s1">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0370" />
- </connection>
<connection
kind="clock"
version="11.1"
@@ -950,7 +882,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_unb_sens.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x00e0" />
+ <parameter name="baseAddress" value="0x0220" />
</connection>
<connection
kind="clock"
@@ -991,25 +923,12 @@ q]]></parameter>
kind="clock"
version="11.1"
start="altpll_0.c0"
- end="reg_ddr3_1.system" />
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="reg_ddr3_1.mem">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0300" />
- </connection>
- <connection
- kind="clock"
- version="11.1"
- start="altpll_0.c0"
- end="reg_diagnostics_0.system" />
+ end="reg_diagnostics.system" />
<connection
kind="avalon"
version="11.1"
start="cpu_0.data_master"
- end="reg_diagnostics_0.mem">
+ end="reg_diagnostics.mem">
<parameter name="arbitrationPriority" value="1" />
<parameter name="baseAddress" value="0x0100" />
</connection>
@@ -1017,27 +936,14 @@ q]]></parameter>
kind="clock"
version="11.1"
start="altpll_0.c0"
- end="reg_diagnostics_1.system" />
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="reg_diagnostics_1.mem">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0200" />
- </connection>
- <connection
- kind="clock"
- version="11.1"
- start="altpll_0.c0"
- end="reg_ddr3_0.system" />
+ end="reg_io_ddr.system" />
<connection
kind="avalon"
version="11.1"
start="cpu_0.data_master"
- end="reg_ddr3_0.mem">
+ end="reg_io_ddr.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0320" />
+ <parameter name="baseAddress" value="0x0080" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
<connection
@@ -1054,7 +960,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="avs_eth_0.mms_reg">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0080" />
+ <parameter name="baseAddress" value="0x00c0" />
</connection>
<connection
kind="avalon"
@@ -1071,4 +977,13 @@ q]]></parameter>
end="avs_eth_0.interrupt">
<parameter name="irqNumber" value="2" />
</connection>
+ <connection kind="clock" version="11.1" start="altpll_0.c0" end="pio_pps.system" />
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="pio_pps.mem">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x0278" />
+ </connection>
</system>