From b11367dcf58692c63fc24171689cc4f9874b4294 Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <thibaut.viard@atmel.com>
Date: Thu, 14 Aug 2014 14:40:19 +0200
Subject: [PATCH] updating validation projects with nosys spec and linker
script
---
.../validation_I2C_I01/build_as6/test.cppproj | 16 ++------
.../validation_I2C_LCD/build_as6/test.cppproj | 18 +++------
.../validation_I2C_RTC/build_as6/test.cppproj | 16 ++------
.../build_as6/test.cppproj | 16 ++------
.../validation_chuck/build_as6/test.cppproj | 16 ++------
.../validation_core/build_as6/test.cppproj | 16 ++------
.../build_as6/test.cppproj | 13 +------
.../build_as6/test.cppproj | 38 ++++++++++++++-----
8 files changed, 55 insertions(+), 94 deletions(-)
diff --git a/cores/validation/validation_I2C_I01/build_as6/test.cppproj b/cores/validation/validation_I2C_I01/build_as6/test.cppproj
index a294228f..3ea16624 100644
--- a/cores/validation/validation_I2C_I01/build_as6/test.cppproj
+++ b/cores/validation/validation_I2C_I01/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -54,11 +53,12 @@
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000012</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -209,7 +209,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -365,14 +365,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_I2C_LCD/build_as6/test.cppproj b/cores/validation/validation_I2C_LCD/build_as6/test.cppproj
index 251136f5..da7a27f8 100644
--- a/cores/validation/validation_I2C_LCD/build_as6/test.cppproj
+++ b/cores/validation/validation_I2C_LCD/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -50,15 +49,16 @@
<ToolNumber>28010306</ToolNumber>
<ToolName>SAM-ICE</ToolName>
</com_atmel_avrdbg_tool_samice>
- <UseGdb>False</UseGdb>
+ <UseGdb>True</UseGdb>
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000003</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -207,7 +207,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -368,14 +368,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_I2C_RTC/build_as6/test.cppproj b/cores/validation/validation_I2C_RTC/build_as6/test.cppproj
index 232d6310..9b7f4395 100644
--- a/cores/validation/validation_I2C_RTC/build_as6/test.cppproj
+++ b/cores/validation/validation_I2C_RTC/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -54,11 +53,12 @@
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000012</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -205,7 +205,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -357,14 +357,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_I2C_multi/build_as6/test.cppproj b/cores/validation/validation_I2C_multi/build_as6/test.cppproj
index a294228f..3ea16624 100644
--- a/cores/validation/validation_I2C_multi/build_as6/test.cppproj
+++ b/cores/validation/validation_I2C_multi/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -54,11 +53,12 @@
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000012</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -209,7 +209,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -365,14 +365,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_chuck/build_as6/test.cppproj b/cores/validation/validation_chuck/build_as6/test.cppproj
index f7a3a294..9b7f4395 100644
--- a/cores/validation/validation_chuck/build_as6/test.cppproj
+++ b/cores/validation/validation_chuck/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -54,11 +53,12 @@
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000003</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -205,7 +205,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -357,14 +357,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_core/build_as6/test.cppproj b/cores/validation/validation_core/build_as6/test.cppproj
index 232d6310..9b7f4395 100644
--- a/cores/validation/validation_core/build_as6/test.cppproj
+++ b/cores/validation/validation_core/build_as6/test.cppproj
@@ -37,12 +37,11 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
- <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
+ <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -54,11 +53,12 @@
<com_atmel_avrdbg_tool_edbg>
<ToolOptions>
<InterfaceProperties>
+ <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000012</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -205,7 +205,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -357,14 +357,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_shield_wifi/build_as6/test.cppproj b/cores/validation/validation_shield_wifi/build_as6/test.cppproj
index e7342ab7..f3d6701a 100644
--- a/cores/validation/validation_shield_wifi/build_as6/test.cppproj
+++ b/cores/validation/validation_shield_wifi/build_as6/test.cppproj
@@ -42,7 +42,6 @@
<com_atmel_avrdbg_tool_samice>
<ToolOptions>
<InterfaceProperties>
- <SwdClock>4000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
@@ -59,7 +58,7 @@
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
- <ToolNumber>ATML2320021800000012</ToolNumber>
+ <ToolNumber>ATML2320021800000009</ToolNumber>
<ToolName>EDBG</ToolName>
</com_atmel_avrdbg_tool_edbg>
</PropertyGroup>
@@ -212,7 +211,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -354,14 +353,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
diff --git a/cores/validation/validation_usb_device/build_as6/test.cppproj b/cores/validation/validation_usb_device/build_as6/test.cppproj
index 2aaeaf2d..a2d9c7e5 100644
--- a/cores/validation/validation_usb_device/build_as6/test.cppproj
+++ b/cores/validation/validation_usb_device/build_as6/test.cppproj
@@ -206,7 +206,7 @@
</armgcccpp.linker.libraries.LibrarySearchPaths>
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
<armgcccpp.linker.memorysettings.ExternalRAM />
- <armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
+ <armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
<armgcccpp.assembler.general.IncludePaths>
<ListValues>
<Value>../../../arduino</Value>
@@ -226,9 +226,27 @@
<ItemGroup>
<Folder Include="core" />
<Folder Include="core\USB" />
+ <Folder Include="Wire" />
+ <Folder Include="SPI" />
<Folder Include="variant" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\..\..\libraries\SPI\SPI.cpp">
+ <SubType>compile</SubType>
+ <Link>SPI\SPI.cpp</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\libraries\SPI\SPI.h">
+ <SubType>compile</SubType>
+ <Link>SPI\SPI.h</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\libraries\Wire\Wire.cpp">
+ <SubType>compile</SubType>
+ <Link>Wire\Wire.cpp</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\libraries\Wire\Wire.h">
+ <SubType>compile</SubType>
+ <Link>Wire\Wire.h</Link>
+ </Compile>
<Compile Include="..\..\..\..\variants\arduino_zero\pins_arduino.h">
<SubType>compile</SubType>
<Link>variant\pins_arduino.h</Link>
@@ -341,14 +359,6 @@
<SubType>compile</SubType>
<Link>core\Stream.h</Link>
</Compile>
- <Compile Include="..\..\..\arduino\syscalls.c">
- <SubType>compile</SubType>
- <Link>core\syscalls.c</Link>
- </Compile>
- <Compile Include="..\..\..\arduino\syscalls.h">
- <SubType>compile</SubType>
- <Link>core\syscalls.h</Link>
- </Compile>
<Compile Include="..\..\..\arduino\Tone.h">
<SubType>compile</SubType>
<Link>core\Tone.h</Link>
@@ -409,6 +419,10 @@
<SubType>compile</SubType>
<Link>core\WCharacter.h</Link>
</Compile>
+ <Compile Include="..\..\..\arduino\WInterrupts.c">
+ <SubType>compile</SubType>
+ <Link>core\WInterrupts.c</Link>
+ </Compile>
<Compile Include="..\..\..\arduino\WInterrupts.h">
<SubType>compile</SubType>
<Link>core\WInterrupts.h</Link>
@@ -421,6 +435,10 @@
<SubType>compile</SubType>
<Link>core\wiring.h</Link>
</Compile>
+ <Compile Include="..\..\..\arduino\wiring_analog.c">
+ <SubType>compile</SubType>
+ <Link>core\wiring_analog.c</Link>
+ </Compile>
<Compile Include="..\..\..\arduino\wiring_analog.h">
<SubType>compile</SubType>
<Link>core\wiring_analog.h</Link>
@@ -473,7 +491,7 @@
<SubType>compile</SubType>
<Link>core\WVariant.h</Link>
</Compile>
- <Compile Include="C:\jcb\support\arduino\ArduinoZero\hardware\arduino\samd\cores\validation\validation_usb_device\test_usb_device.cpp">
+ <Compile Include="..\test_usb_device.cpp">
<SubType>compile</SubType>
<Link>test_usb_device.cpp</Link>
</Compile>
--
GitLab