Skip to content

Commit 3e88c95

Browse files
gvdwgvdw
committed
Merge pull request #1 from butschfried/master
Wibo integration
2 parents 487d7aa + fadc463 commit 3e88c95

File tree

8 files changed

+694
-137
lines changed

8 files changed

+694
-137
lines changed

‎hardware/pinoccio/avr/bootloaders/STK500RFR2/STK500RFR2.atsln

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "STK500RFR2", "STK500RFR2.cp
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8-
Debug|AVR = Debug|AVR
9-
Release|AVR = Release|AVR
8+
_PINOCCIO_256RFR2_|AVR = _PINOCCIO_256RFR2_|AVR
109
EndGlobalSection
1110
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}.Debug|AVR.ActiveCfg = Debug|AVR
13-
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}.Debug|AVR.Build.0 = Debug|AVR
14-
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}.Release|AVR.ActiveCfg = Release|AVR
15-
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}.Release|AVR.Build.0 = Release|AVR
11+
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}._PINOCCIO_256RFR2_|AVR.ActiveCfg = _PINOCCIO_256RFR2_|AVR
12+
{C331F1EE-7ACC-4F4A-B5E7-5463EB3C23A8}._PINOCCIO_256RFR2_|AVR.Build.0 = _PINOCCIO_256RFR2_|AVR
1613
EndGlobalSection
1714
GlobalSection(SolutionProperties) = preSolution
1815
HideSolutionNode = FALSE

‎hardware/pinoccio/avr/bootloaders/STK500RFR2/STK500RFR2.atsuo

3.5 KB
Binary file not shown.

‎hardware/pinoccio/avr/bootloaders/STK500RFR2/STK500RFR2.cproj

Lines changed: 66 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
<OverrideVtorValue>exception_table</OverrideVtorValue>
6262
<BootSegment>2</BootSegment>
6363
<eraseonlaunchrule>0</eraseonlaunchrule>
64-
<avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
64+
<avrtool>com.atmel.avrdbg.tool.jtagice3plus</avrtool>
6565
<avrtoolinterface>JTAG</avrtoolinterface>
6666
<com_atmel_avrdbg_tool_edbg>
6767
<ToolOptions>
6868
<InterfaceProperties>
69-
<JtagEnableExtResetOnStartSession>true</JtagEnableExtResetOnStartSession>
70-
<JtagDbgClock>220000</JtagDbgClock>
69+
<JtagEnableExtResetOnStartSession>false</JtagEnableExtResetOnStartSession>
70+
<JtagDbgClock>0</JtagDbgClock>
7171
<JtagInChain>false</JtagInChain>
7272
<JtagDevicesBefore>0</JtagDevicesBefore>
7373
<JtagDevicesAfter>0</JtagDevicesAfter>
@@ -80,13 +80,31 @@
8080
<ToolNumber>ATML1784030200000283</ToolNumber>
8181
<ToolName>XPRO-EDBG</ToolName>
8282
</com_atmel_avrdbg_tool_edbg>
83+
<com_atmel_avrdbg_tool_jtagice3plus>
84+
<ToolOptions>
85+
<InterfaceProperties>
86+
<JtagEnableExtResetOnStartSession>false</JtagEnableExtResetOnStartSession>
87+
<JtagDbgClock>200000</JtagDbgClock>
88+
</InterfaceProperties>
89+
<InterfaceName>JTAG</InterfaceName>
90+
</ToolOptions>
91+
<ToolType>com.atmel.avrdbg.tool.jtagice3plus</ToolType>
92+
<ToolNumber>J30200022154</ToolNumber>
93+
<ToolName>JTAGICE3</ToolName>
94+
</com_atmel_avrdbg_tool_jtagice3plus>
95+
<preserveEEPROM>True</preserveEEPROM>
8396
</PropertyGroup>
84-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
97+
<PropertyGroup Condition=" '$(Configuration)' == '_AVR_ATmega256RFR2_XPLAINED_PRO_' ">
8598
<ToolchainSettings>
8699
<AvrGcc>
100+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
101+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
102+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
103+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
87104
<avrgcc.compiler.symbols.DefSymbols>
88105
<ListValues>
89-
<Value>BOARD=USER_BOARD</Value>
106+
<Value>_AVR_ATmega256RFR2_XPLAINED_PRO_=1</Value>
107+
<Value>F_CPU=16000000UL</Value>
90108
</ListValues>
91109
</avrgcc.compiler.symbols.DefSymbols>
92110
<avrgcc.compiler.directories.IncludePaths>
@@ -100,6 +118,18 @@
100118
<Value>../src/config</Value>
101119
</ListValues>
102120
</avrgcc.compiler.directories.IncludePaths>
121+
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
122+
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
123+
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
124+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
125+
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
126+
<avrgcc.linker.memorysettings.Flash>
127+
<ListValues>
128+
<Value>.text=0x1F000</Value>
129+
</ListValues>
130+
</avrgcc.linker.memorysettings.Flash>
131+
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
132+
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
103133
<avrgcc.assembler.general.IncludePaths>
104134
<ListValues>
105135
<Value>../src</Value>
@@ -111,26 +141,7 @@
111141
<Value>../src/config</Value>
112142
</ListValues>
113143
</avrgcc.assembler.general.IncludePaths>
114-
<!-- Project configurable options -->
115-
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
116-
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
117-
<avrgcc.linker.libraries.Libraries />
118-
<avrgcc.linker.libraries.LibrarySearchPaths />
119-
<avrgcc.linker.general.DoNotUseStandardStartFiles>False</avrgcc.linker.general.DoNotUseStandardStartFiles>
120-
<avrgcc.linker.general.DoNotUseDefaultLibraries>False</avrgcc.linker.general.DoNotUseDefaultLibraries>
121-
<avrgcc.linker.general.NoStartupOrDefaultLibs>False</avrgcc.linker.general.NoStartupOrDefaultLibs>
122-
<!-- Fixed options, according to ASF 2 MEGA/XMEGA Makefile -->
123-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
124-
<avrgcc.compiler.optimization.DebugLevel>None</avrgcc.compiler.optimization.DebugLevel>
125-
<avrgcc.linker.optimization.RelaxBranches>True</avrgcc.linker.optimization.RelaxBranches>
126-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>False</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
127-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>False</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
128-
<avrgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</avrgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
129-
<avrgcc.linker.optimization.GarbageCollectUnusedSections>True</avrgcc.linker.optimization.GarbageCollectUnusedSections>
130-
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
131-
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
132-
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
133-
<avrgcc.assembler.debugging.DebugLevel>None</avrgcc.assembler.debugging.DebugLevel>
144+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
134145
</AvrGcc>
135146
</ToolchainSettings>
136147
<MemorySettings />
@@ -139,7 +150,7 @@
139150
<GenerateListFile>True</GenerateListFile>
140151
<GenerateEepFile>True</GenerateEepFile>
141152
</PropertyGroup>
142-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
153+
<PropertyGroup Condition=" '$(Configuration)' == '_PINOCCIO_256RFR2_' ">
143154
<ToolchainSettings>
144155
<AvrGcc>
145156
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
@@ -148,28 +159,41 @@
148159
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
149160
<avrgcc.compiler.symbols.DefSymbols>
150161
<ListValues>
151-
<Value>BOARD=USER_BOARD</Value>
162+
<Value>F_CPU=16000000UL</Value>
163+
<Value>_PINOCCIO_256RFR2_=1</Value>
164+
<Value>pinoccio</Value>
165+
<Value>_SW_VERSION_=5</Value>
166+
<Value>WIBO_FLAVOUR_BOOTLUP=1</Value>
152167
</ListValues>
153168
</avrgcc.compiler.symbols.DefSymbols>
154169
<avrgcc.compiler.directories.IncludePaths>
155170
<ListValues>
156-
<Value>../src</Value>
157-
<Value>../src/ASF/common/boards</Value>
158-
<Value>../src/ASF/common/boards/user_board</Value>
159-
<Value>../src/ASF/common/utils</Value>
160-
<Value>../src/ASF/mega/utils</Value>
161-
<Value>../src/ASF/mega/utils/preprocessor</Value>
162-
<Value>../src/config</Value>
171+
<Value>../uracoli-src/inc</Value>
172+
<Value>../uracoli-src/inc/boards</Value>
163173
</ListValues>
164174
</avrgcc.compiler.directories.IncludePaths>
165-
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
175+
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
166176
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
177+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
178+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
167179
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
168180
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
169-
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
181+
<avrgcc.compiler.warnings.Pedantic>True</avrgcc.compiler.warnings.Pedantic>
182+
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
183+
<avrgcc.linker.libraries.Libraries>
184+
<ListValues>
185+
<Value>uracoli_pinoccio</Value>
186+
</ListValues>
187+
</avrgcc.linker.libraries.Libraries>
188+
<avrgcc.linker.libraries.LibrarySearchPaths>
189+
<ListValues>
190+
<Value>../uracoli-src/lib</Value>
191+
</ListValues>
192+
</avrgcc.linker.libraries.LibrarySearchPaths>
170193
<avrgcc.linker.memorysettings.Flash>
171194
<ListValues>
172195
<Value>.text=0x1F000</Value>
196+
<Value>.bootlup=0x1FE80</Value>
173197
</ListValues>
174198
</avrgcc.linker.memorysettings.Flash>
175199
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
@@ -193,6 +217,7 @@
193217
<GenerateMapFile>True</GenerateMapFile>
194218
<GenerateListFile>True</GenerateListFile>
195219
<GenerateEepFile>True</GenerateEepFile>
220+
<OutputPath>bin\_PINOCCIO_256RFR2_\</OutputPath>
196221
</PropertyGroup>
197222
<ItemGroup>
198223
<Compile Include="src\avrinterruptnames.h">
@@ -207,75 +232,17 @@
207232
<Compile Include="src\main.c">
208233
<SubType>compile</SubType>
209234
</Compile>
210-
<Compile Include="src\ASF\common\boards\user_board\init.c">
235+
<Compile Include="src\wibo.c">
211236
<SubType>compile</SubType>
237+
<Link>src\wibo.c</Link>
212238
</Compile>
213-
<None Include="src\asf.h">
214-
<SubType>compile</SubType>
215-
</None>
216-
<None Include="src\config\conf_board.h">
217-
<SubType>compile</SubType>
218-
</None>
219-
<None Include="src\ASF\common\boards\board.h">
220-
<SubType>compile</SubType>
221-
</None>
222-
<None Include="src\ASF\common\boards\user_board\user_board.h">
223-
<SubType>compile</SubType>
224-
</None>
225-
<None Include="src\ASF\common\utils\interrupt.h">
226-
<SubType>compile</SubType>
227-
</None>
228-
<None Include="src\ASF\common\utils\interrupt\interrupt_avr8.h">
229-
<SubType>compile</SubType>
230-
</None>
231-
<None Include="src\ASF\common\utils\make\Makefile.avr.in">
239+
<Compile Include="src\wibo.h">
232240
<SubType>compile</SubType>
233-
</None>
234-
<None Include="src\ASF\common\utils\parts.h">
235-
<SubType>compile</SubType>
236-
</None>
237-
<None Include="src\ASF\mega\utils\assembler.h">
238-
<SubType>compile</SubType>
239-
</None>
240-
<None Include="src\ASF\mega\utils\assembler\gas.h">
241-
<SubType>compile</SubType>
242-
</None>
243-
<None Include="src\ASF\mega\utils\compiler.h">
244-
<SubType>compile</SubType>
245-
</None>
246-
<None Include="src\ASF\mega\utils\preprocessor\mrepeat.h">
247-
<SubType>compile</SubType>
248-
</None>
249-
<None Include="src\ASF\mega\utils\preprocessor\preprocessor.h">
250-
<SubType>compile</SubType>
251-
</None>
252-
<None Include="src\ASF\mega\utils\preprocessor\stringz.h">
253-
<SubType>compile</SubType>
254-
</None>
255-
<None Include="src\ASF\mega\utils\preprocessor\tpaste.h">
256-
<SubType>compile</SubType>
257-
</None>
258-
<None Include="src\ASF\mega\utils\progmem.h">
259-
<SubType>compile</SubType>
260-
</None>
261-
<None Include="src\ASF\mega\utils\status_codes.h">
262-
<SubType>compile</SubType>
263-
</None>
241+
<Link>src\wibo.h</Link>
242+
</Compile>
264243
</ItemGroup>
265244
<ItemGroup>
266245
<Folder Include="src\" />
267-
<Folder Include="src\ASF\" />
268-
<Folder Include="src\ASF\common\" />
269-
<Folder Include="src\ASF\common\boards\" />
270-
<Folder Include="src\ASF\common\boards\user_board\" />
271-
<Folder Include="src\ASF\common\utils\" />
272-
<Folder Include="src\ASF\common\utils\interrupt\" />
273-
<Folder Include="src\ASF\common\utils\make\" />
274-
<Folder Include="src\ASF\mega\" />
275-
<Folder Include="src\ASF\mega\utils\" />
276-
<Folder Include="src\ASF\mega\utils\assembler\" />
277-
<Folder Include="src\ASF\mega\utils\preprocessor\" />
278-
<Folder Include="src\config\" />
279246
</ItemGroup>
280247
<Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\AvrGCC.targets" />
281248
</Project>

‎hardware/pinoccio/avr/bootloaders/STK500RFR2/readme.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
integrate uracoli into bootloader:
3+
(1) fetch uracoli-src package http://uracoli.nongnu.org/download.html
4+
(2) extract to folder "uracoli-src"
5+
(3) build for board pinoccio: uracoli-src> make -C src pinccio
6+
(4) Atmel Studio Project references to libs in folder /lib and /inc
7+

0 commit comments

Comments
 (0)