Skip to content

Commit fd82adc

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents f6616d9 + 523c560 commit fd82adc

File tree

10 files changed

+1458
-238
lines changed

10 files changed

+1458
-238
lines changed

ClearCore.atsln

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Atmel Studio Solution File, Format Version 11.00
4-
VisualStudioVersion = 14.0.25420.1
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "ClearCoreArduino", "ClearCoreArduino.cppproj", "{DC06454F-445D-4E8C-A03E-22236431B9DE}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -13,6 +13,13 @@ Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "ClearCore", "Teknic\libClea
1313
EndProject
1414
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "LwIP", "Teknic\LwIP\LwIP.cppproj", "{C373696C-5D45-4B91-AD62-A21552361596}"
1515
EndProject
16+
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "TestSketch", "TestSketch\TestSketch.cppproj", "{DCE6C7E3-EE26-4D79-826B-08594B9AD897}"
17+
ProjectSection(ProjectDependencies) = postProject
18+
{DC06454F-445D-4E8C-A03E-22236431B9DE} = {DC06454F-445D-4E8C-A03E-22236431B9DE}
19+
{C373696C-5D45-4B91-AD62-A21552361596} = {C373696C-5D45-4B91-AD62-A21552361596}
20+
{2530D5B1-8A40-4A55-95CA-2EC0B63E2088} = {2530D5B1-8A40-4A55-95CA-2EC0B63E2088}
21+
EndProjectSection
22+
EndProject
1623
Global
1724
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1825
Debug|ARM = Debug|ARM
@@ -31,6 +38,10 @@ Global
3138
{C373696C-5D45-4B91-AD62-A21552361596}.Debug|ARM.Build.0 = Debug|ARM
3239
{C373696C-5D45-4B91-AD62-A21552361596}.Release|ARM.ActiveCfg = Release|ARM
3340
{C373696C-5D45-4B91-AD62-A21552361596}.Release|ARM.Build.0 = Release|ARM
41+
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|ARM.ActiveCfg = Debug|ARM
42+
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|ARM.Build.0 = Debug|ARM
43+
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|ARM.ActiveCfg = Release|ARM
44+
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|ARM.Build.0 = Release|ARM
3445
EndGlobalSection
3546
GlobalSection(SolutionProperties) = preSolution
3647
HideSolutionNode = FALSE

ClearCoreArduino.cppproj

Lines changed: 206 additions & 210 deletions
Large diffs are not rendered by default.
Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
/*
2+
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
3+
4+
This library is free software; you can redistribute it and/or
5+
modify it under the terms of the GNU Lesser General Public
6+
License as published by the Free Software Foundation; either
7+
version 2.1 of the License, or (at your option) any later version.
8+
9+
This library is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12+
See the GNU Lesser General Public License for more details.
13+
14+
You should have received a copy of the GNU Lesser General Public
15+
License along with this library; if not, write to the Free Software
16+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17+
*/
18+
19+
/* Linker script to configure memory regions.
20+
* Need modifying for a specific board.
21+
* FLASH.ORIGIN: starting address of flash
22+
* FLASH.LENGTH: length of flash
23+
* RAM.ORIGIN: starting address of RAM bank 0
24+
* RAM.LENGTH: length of RAM bank 0
25+
*/
26+
MEMORY
27+
{
28+
FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x80000-0x4000 /* First 16KB used by bootloader */
29+
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x30000
30+
}
31+
32+
/* Linker script to place sections and symbol values. Should be used together
33+
* with other linker script that defines memory regions FLASH and RAM.
34+
* It references following symbols, which must be defined in code:
35+
* Reset_Handler : Entry of reset handler
36+
*
37+
* It defines following symbols, which code can use without definition:
38+
* __exidx_start
39+
* __exidx_end
40+
* __copy_table_start__
41+
* __copy_table_end__
42+
* __zero_table_start__
43+
* __zero_table_end__
44+
* __etext
45+
* __data_start__
46+
* __preinit_array_start
47+
* __preinit_array_end
48+
* __init_array_start
49+
* __init_array_end
50+
* __fini_array_start
51+
* __fini_array_end
52+
* __data_end__
53+
* __bss_start__
54+
* __bss_end__
55+
* __end__
56+
* end
57+
* __HeapLimit
58+
* __StackLimit
59+
* __StackTop
60+
* __stack
61+
*/
62+
ENTRY(Reset_Handler)
63+
EXTERN(exception_table)
64+
65+
SECTIONS
66+
{
67+
.text :
68+
{
69+
__text_start__ = .;
70+
71+
KEEP(*(.sketch_boot))
72+
73+
. = ALIGN(0x4000);
74+
KEEP(*(.vectors))
75+
*(.text*)
76+
77+
KEEP(*(.init))
78+
KEEP(*(.fini))
79+
80+
/* .ctors */
81+
*crtbegin.o(.ctors)
82+
*crtbegin?.o(.ctors)
83+
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
84+
*(SORT(.ctors.*))
85+
*(.ctors)
86+
87+
/* .dtors */
88+
*crtbegin.o(.dtors)
89+
*crtbegin?.o(.dtors)
90+
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
91+
*(SORT(.dtors.*))
92+
*(.dtors)
93+
94+
. = ALIGN(4);
95+
/* preinit data */
96+
PROVIDE_HIDDEN (__preinit_array_start = .);
97+
KEEP(*(.preinit_array))
98+
PROVIDE_HIDDEN (__preinit_array_end = .);
99+
100+
. = ALIGN(4);
101+
/* init data */
102+
PROVIDE_HIDDEN (__init_array_start = .);
103+
KEEP(*(SORT(.init_array.*)))
104+
KEEP(*(.init_array))
105+
PROVIDE_HIDDEN (__init_array_end = .);
106+
107+
108+
. = ALIGN(4);
109+
/* finit data */
110+
PROVIDE_HIDDEN (__fini_array_start = .);
111+
KEEP(*(SORT(.fini_array.*)))
112+
KEEP(*(.fini_array))
113+
PROVIDE_HIDDEN (__fini_array_end = .);
114+
115+
*(.rodata*)
116+
117+
KEEP(*(.eh_frame*))
118+
} > FLASH
119+
120+
.ARM.extab :
121+
{
122+
*(.ARM.extab* .gnu.linkonce.armextab.*)
123+
} > FLASH
124+
125+
__exidx_start = .;
126+
.ARM.exidx :
127+
{
128+
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
129+
} > FLASH
130+
__exidx_end = .;
131+
132+
/* To copy multiple ROM to RAM sections,
133+
* uncomment .copy.table section and,
134+
* define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
135+
/*
136+
.copy.table :
137+
{
138+
. = ALIGN(4);
139+
__copy_table_start__ = .;
140+
LONG (__etext)
141+
LONG (__data_start__)
142+
LONG (__data_end__ - __data_start__)
143+
LONG (__etext2)
144+
LONG (__data2_start__)
145+
LONG (__data2_end__ - __data2_start__)
146+
__copy_table_end__ = .;
147+
} > FLASH
148+
*/
149+
150+
/* To clear multiple BSS sections,
151+
* uncomment .zero.table section and,
152+
* define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
153+
/*
154+
.zero.table :
155+
{
156+
. = ALIGN(4);
157+
__zero_table_start__ = .;
158+
LONG (__bss_start__)
159+
LONG (__bss_end__ - __bss_start__)
160+
LONG (__bss2_start__)
161+
LONG (__bss2_end__ - __bss2_start__)
162+
__zero_table_end__ = .;
163+
} > FLASH
164+
*/
165+
166+
__etext = .;
167+
168+
.data : AT (__etext)
169+
{
170+
__data_start__ = .;
171+
*(vtable)
172+
*(.data*)
173+
174+
KEEP(*(.jcr*))
175+
. = ALIGN(16);
176+
/* All data end */
177+
__data_end__ = .;
178+
179+
} > RAM
180+
181+
.bss :
182+
{
183+
. = ALIGN(4);
184+
__bss_start__ = .;
185+
*(.bss*)
186+
*(COMMON)
187+
. = ALIGN(4);
188+
__bss_end__ = .;
189+
} > RAM
190+
191+
.heap (COPY):
192+
{
193+
__end__ = .;
194+
PROVIDE(end = .);
195+
*(.heap*)
196+
__HeapLimit = .;
197+
} > RAM
198+
199+
/* .stack_dummy section doesn't contains any symbols. It is only
200+
* used for linker to calculate size of stack sections, and assign
201+
* values to stack symbols later */
202+
.stack_dummy (COPY):
203+
{
204+
*(.stack*)
205+
} > RAM
206+
207+
/* Set stack top to end of RAM, and stack limit move down by
208+
* size of stack_dummy section */
209+
__StackTop = ORIGIN(RAM) + LENGTH(RAM);
210+
__StackLimit = __StackTop - SIZEOF(.stack_dummy);
211+
PROVIDE(__stack = __StackTop);
212+
213+
__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
214+
215+
/* Check if data + heap + stack exceeds RAM limit */
216+
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
217+
}

0 commit comments

Comments
 (0)