len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 17:48:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

FreeRTOS source changes:

Browse source 
+ heap_1.c and heap_2.c now support configAPPLICATION_ALLOCATED_HEAP (heap_4.c already did) which allows the heap to be placed by the user rather than the linker.

Demo app changes:
+ SAMD20 project has been updated to use Atmel Studio 7.
This commit is contained in:
Richard Barry 2015-11-22 21:14:39 +00:00
parent e9561c946c
commit fa86d4eece
5 changed files with 52 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

70
FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/RTOSDemo.cproj
View file

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>6.1</ProjectVersion>
<ProjectVersion>7.0</ProjectVersion>
<ProjectGuid>{2a475b6a-78b0-4237-8947-341bd379ab5c}</ProjectGuid>
<Name>$(MSBuildProjectName)</Name>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
@ -165,7 +165,7 @@
<documentation help="http://asf.atmel.com/docs/3.11.0/common.applications.user_application.xplained_pro2.samd20_xplained_pro/html/index.html" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.11.0" />
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.18.1" />
</dependencies>
<project id="common.applications.user_application.xplained_pro2.samd20_xplained_pro" value="Add" config="" content-id="Atmel.ASF" />
<board id="board.samd20_xplained_pro" value="Add" config="" content-id="Atmel.ASF" />
@ -216,6 +216,8 @@
<ToolNumber>000591000435</ToolNumber>
<ToolName>J-Link</ToolName>
</com_atmel_avrdbg_tool_samice>
<preserveEEPROM>true</preserveEEPROM>
<ExternalProgrammingToolCommand />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings>
@ -282,38 +284,6 @@
</armgcc.linker.libraries.LibrarySearchPaths>
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
<armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam0/utils/linker_scripts/samd20/gcc/samd20j18_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
<armgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../src</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src/ASF/sam0/boards</Value>
<Value>../src/ASF/sam0/boards/samd20_xplained_pro</Value>
<Value>../src/ASF/sam0/drivers/port</Value>
<Value>../src/ASF/sam0/drivers/system</Value>
<Value>../src/ASF/sam0/drivers/system/clock</Value>
<Value>../src/ASF/sam0/drivers/system/interrupt</Value>
<Value>../src/ASF/sam0/drivers/system/pinmux</Value>
<Value>../src/ASF/sam0/utils</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/component</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/instance</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/pio</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/source</Value>
<Value>../src/ASF/sam0/utils/header_files</Value>
<Value>../src/ASF/sam0/utils/preprocessor</Value>
<Value>../src/ASF/thirdparty/CMSIS/Include</Value>
<Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src/config</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\samd20\include</Value>
<Value>../src/ASF/common/services/serial</Value>
<Value>../src/ASF/sam0/drivers/sercom</Value>
<Value>../src/ASF/sam0/drivers/sercom/usart</Value>
</ListValues>
</armgcc.assembler.general.IncludePaths>
<armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM0=true -DBOARD=SAMD20_XPLAINED_PRO -D__SAMD20J18__ -DUSART_CALLBACK_MODE=true</armgcc.preprocessingassembler.general.AssemblerFlags>
<armgcc.preprocessingassembler.general.IncludePaths>
<ListValues>
@ -419,38 +389,6 @@
</armgcc.linker.libraries.LibrarySearchPaths>
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
<armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam0/utils/linker_scripts/samd20/gcc/samd20j18_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
<armgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../src</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src/ASF/sam0/boards</Value>
<Value>../src/ASF/sam0/boards/samd20_xplained_pro</Value>
<Value>../src/ASF/sam0/drivers/port</Value>
<Value>../src/ASF/sam0/drivers/system</Value>
<Value>../src/ASF/sam0/drivers/system/clock</Value>
<Value>../src/ASF/sam0/drivers/system/interrupt</Value>
<Value>../src/ASF/sam0/drivers/system/pinmux</Value>
<Value>../src/ASF/sam0/utils</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/component</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/instance</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/include/pio</Value>
<Value>../src/ASF/sam0/utils/cmsis/samd20/source</Value>
<Value>../src/ASF/sam0/utils/header_files</Value>
<Value>../src/ASF/sam0/utils/preprocessor</Value>
<Value>../src/ASF/thirdparty/CMSIS/Include</Value>
<Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src/config</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>
<Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\samd20\include</Value>
<Value>../src/ASF/common/services/serial</Value>
<Value>../src/ASF/sam0/drivers/sercom</Value>
<Value>../src/ASF/sam0/drivers/sercom/usart</Value>
</ListValues>
</armgcc.assembler.general.IncludePaths>
<armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
<armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM0=true -DBOARD=SAMD20_XPLAINED_PRO -D__SAMD20J18__ -DUSART_CALLBACK_MODE=true</armgcc.preprocessingassembler.general.AssemblerFlags>
<armgcc.preprocessingassembler.general.IncludePaths>

2
FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/src/main.c
View file

@ -137,7 +137,7 @@ int main (void)
/* The mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is described at the top
of this file. */
#if mainCREATE_SIMPLE_BLINKY_DEMO_ONLY == 1
#if( mainCREATE_SIMPLE_BLINKY_DEMO_ONLY == 1 )
{
main_blinky();
}