From fcb28fbb05edd7d8b3ca74d68c0bfc31a8a016f3 Mon Sep 17 00:00:00 2001 From: Pepping <pepping> Date: Thu, 12 Feb 2015 10:21:47 +0000 Subject: [PATCH] replaced and renamed avs_eth with avs eth2 --- .../unb1_fn_bf/quartus/sopc_unb1_fn_bf.sopc | 182 +++++++++--------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/applications/unb1_fn_bf/quartus/sopc_unb1_fn_bf.sopc b/applications/unb1_fn_bf/quartus/sopc_unb1_fn_bf.sopc index d495a3109f..db9f51a854 100644 --- a/applications/unb1_fn_bf/quartus/sopc_unb1_fn_bf.sopc +++ b/applications/unb1_fn_bf/quartus/sopc_unb1_fn_bf.sopc @@ -22,7 +22,7 @@ { datum _sortIndex { - value = "8"; + value = "21"; type = "int"; } } @@ -92,35 +92,35 @@ type = "String"; } } - element reg_diag_bg.mem + element ram_ss_ss_wide.mem { datum baseAddress { - value = "352"; + value = "524288"; type = "long"; } } - element reg_dp_ram_from_mm.mem + element reg_diag_bg.mem { datum baseAddress { - value = "480"; + value = "352"; type = "long"; } } - element ram_diag_bg.mem + element reg_st_sst.mem { datum baseAddress { - value = "32768"; + value = "192"; type = "long"; } } - element ram_ss_ss_wide.mem + element ram_st_sst.mem { datum baseAddress { - value = "524288"; + value = "16384"; type = "long"; } } @@ -153,7 +153,7 @@ type = "long"; } } - element rom_system_info.mem + element pio_system_info.mem { datum _lockedAddress { @@ -162,52 +162,52 @@ } datum baseAddress { - value = "4096"; + value = "0"; type = "long"; } } - element ram_st_sst.mem + element ram_dp_ram_from_mm.mem { datum baseAddress { - value = "16384"; + value = "128"; type = "long"; } } - element reg_st_sst.mem + element reg_dp_ram_from_mm.mem { datum baseAddress { - value = "256"; + value = "480"; type = "long"; } } - element reg_unb_sens.mem + element rom_system_info.mem { + datum _lockedAddress + { + value = "1"; + type = "boolean"; + } datum baseAddress { - value = "384"; + value = "4096"; type = "long"; } } - element ram_dp_ram_from_mm.mem + element reg_unb_sens.mem { datum baseAddress { - value = "192"; + value = "384"; type = "long"; } } - element pio_system_info.mem + element ram_diag_bg.mem { - datum _lockedAddress - { - value = "1"; - type = "boolean"; - } datum baseAddress { - value = "0"; + value = "32768"; type = "long"; } } @@ -223,7 +223,7 @@ { datum baseAddress { - value = "128"; + value = "256"; type = "long"; } } @@ -265,7 +265,7 @@ { datum _sortIndex { - value = "16"; + value = "15"; type = "int"; } } @@ -273,7 +273,7 @@ { datum _sortIndex { - value = "14"; + value = "13"; type = "int"; } } @@ -307,7 +307,7 @@ { datum _sortIndex { - value = "9"; + value = "8"; type = "int"; } } @@ -315,7 +315,7 @@ { datum _sortIndex { - value = "11"; + value = "10"; type = "int"; } } @@ -323,7 +323,7 @@ { datum _sortIndex { - value = "19"; + value = "18"; type = "int"; } } @@ -331,7 +331,7 @@ { datum _sortIndex { - value = "21"; + value = "20"; type = "int"; } } @@ -339,7 +339,7 @@ { datum _sortIndex { - value = "10"; + value = "9"; type = "int"; } } @@ -347,7 +347,7 @@ { datum _sortIndex { - value = "12"; + value = "11"; type = "int"; } } @@ -355,7 +355,7 @@ { datum _sortIndex { - value = "18"; + value = "17"; type = "int"; } } @@ -363,7 +363,7 @@ { datum _sortIndex { - value = "20"; + value = "19"; type = "int"; } } @@ -371,7 +371,7 @@ { datum _sortIndex { - value = "13"; + value = "12"; type = "int"; } } @@ -379,7 +379,7 @@ { datum _sortIndex { - value = "17"; + value = "16"; type = "int"; } } @@ -387,36 +387,36 @@ { datum _sortIndex { - value = "15"; + value = "14"; type = "int"; } } - element timer_0.s1 + element onchip_memory2_0.s1 { + datum _lockedAddress + { + value = "1"; + type = "boolean"; + } datum baseAddress { - value = "320"; + value = "131072"; type = "long"; } } - element pio_debug_wave.s1 + element timer_0.s1 { datum baseAddress { - value = "432"; + value = "320"; type = "long"; } } - element onchip_memory2_0.s1 + element pio_debug_wave.s1 { - datum _lockedAddress - { - value = "1"; - type = "boolean"; - } datum baseAddress { - value = "131072"; + value = "432"; type = "long"; } } @@ -458,8 +458,8 @@ <parameter name="maxAdditionalLatency" value="0" /> <parameter name="projectName" value="unb1_fn_bf.qpf" /> <parameter name="sopcBorderPoints" value="true" /> - <parameter name="systemHash" value="-64769796847" /> - <parameter name="timeStamp" value="1383149163658" /> + <parameter name="systemHash" value="-61772755527" /> + <parameter name="timeStamp" value="1423150120590" /> <parameter name="useTestBenchNamingPattern" value="false" /> <module kind="clock_source" version="11.1" enabled="1" name="clk_0"> <parameter name="clockFrequency" value="25000000" /> @@ -560,7 +560,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='ram_dp_ram_from_mm.mem' start='0xC0' end='0x100' /><slave name='reg_st_sst.mem' start='0x100' end='0x140' /><slave name='timer_0.s1' start='0x140' end='0x160' /><slave name='reg_diag_bg.mem' start='0x160' end='0x180' /><slave name='reg_unb_sens.mem' start='0x180' end='0x1A0' /><slave name='altpll_0.pll_slave' start='0x1A0' end='0x1B0' /><slave name='pio_debug_wave.s1' start='0x1B0' end='0x1C0' /><slave name='pio_wdi.s1' start='0x1C0' end='0x1D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x1D0' end='0x1D8' /><slave name='pio_pps.mem' start='0x1D8' end='0x1E0' /><slave name='reg_dp_ram_from_mm.mem' start='0x1E0' end='0x1E8' /><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='avs_eth_0.mms_ram' start='0x10000' end='0x11000' /><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' /></address-map>]]></parameter> + <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='ram_dp_ram_from_mm.mem' start='0x80' end='0xC0' /><slave name='reg_st_sst.mem' start='0xC0' end='0x100' /><slave name='avs_eth_0.mms_reg' start='0x100' end='0x140' /><slave name='timer_0.s1' start='0x140' end='0x160' /><slave name='reg_diag_bg.mem' start='0x160' end='0x180' /><slave name='reg_unb_sens.mem' start='0x180' end='0x1A0' /><slave name='altpll_0.pll_slave' start='0x1A0' end='0x1B0' /><slave name='pio_debug_wave.s1' start='0x1B0' end='0x1C0' /><slave name='pio_wdi.s1' start='0x1C0' end='0x1D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x1D0' end='0x1D8' /><slave name='pio_pps.mem' start='0x1D8' end='0x1E0' /><slave name='reg_dp_ram_from_mm.mem' start='0x1E0' end='0x1E8' /><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='avs_eth_0.mms_ram' start='0x10000' end='0x11000' /><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' /></address-map>]]></parameter> <parameter name="dataAddrWidth" value="20" /> <parameter name="customInstSlavesSystemInfo" value="<info/>" /> <parameter name="cpuReset" value="false" /> @@ -823,9 +823,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="125000000" /> - </module> <module kind="avs_common_mm" version="1.0" enabled="1" name="ram_bf_weights"> <parameter name="g_adr_w" value="16" /> <parameter name="g_dat_w" value="32" /> @@ -899,6 +896,9 @@ q]]></parameter> <parameter name="g_dat_w" value="32" /> <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="125000000" /> </module> + <module kind="avs2_eth_coe" version="1.0" enabled="1" name="avs_eth_0"> + <parameter name="AUTO_MM_CLOCK_RATE" value="125000000" /> + </module> <connection kind="avalon" version="11.1" @@ -1000,38 +1000,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="0x0080" /> - </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="0x00010000" /> - </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" @@ -1165,7 +1133,7 @@ q]]></parameter> start="cpu_0.data_master" end="ram_dp_ram_from_mm.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x00c0" /> + <parameter name="baseAddress" value="0x0080" /> </connection> <connection kind="clock" @@ -1178,7 +1146,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_st_sst.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0100" /> + <parameter name="baseAddress" value="0x00c0" /> </connection> <connection kind="clock" @@ -1193,4 +1161,36 @@ q]]></parameter> <parameter name="arbitrationPriority" value="1" /> <parameter name="baseAddress" value="0x00080000" /> </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="0x0100" /> + </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="0x00010000" /> + </connection> + <connection + kind="interrupt" + version="11.1" + start="cpu_0.d_irq" + end="avs_eth_0.interrupt"> + <parameter name="irqNumber" value="2" /> + </connection> </system> -- GitLab