Skip to content

Commit 6cb99d9

Browse files
PrzemekWirkusPrzemekWirkus
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed 
2 parents 47a8df4 + d54a289 commit 6cb99d9

File tree

7 files changed

+163
-8
lines changed

7 files changed

+163
-8
lines changed

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_501/LPC11U35.ld

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
/* Linker script to configure memory regions. */
2+
MEMORY
3+
{
4+
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K
5+
RAM (rwx) : ORIGIN = 0x100000C0, LENGTH = 0x1F40
6+
USB_RAM (rwx): ORIGIN = 0x20004000, LENGTH = 0x800
7+
}
8+
9+
/* Linker script to place sections and symbol values. Should be used together
10+
* with other linker script that defines memory regions FLASH and RAM.
11+
* It references following symbols, which must be defined in code:
12+
* Reset_Handler : Entry of reset handler
13+
*
14+
* It defines following symbols, which code can use without definition:
15+
* __exidx_start
16+
* __exidx_end
17+
* __etext
18+
* __data_start__
19+
* __preinit_array_start
20+
* __preinit_array_end
21+
* __init_array_start
22+
* __init_array_end
23+
* __fini_array_start
24+
* __fini_array_end
25+
* __data_end__
26+
* __bss_start__
27+
* __bss_end__
28+
* __end__
29+
* end
30+
* __HeapLimit
31+
* __StackLimit
32+
* __StackTop
33+
* __stack
34+
*/
35+
ENTRY(Reset_Handler)
36+
37+
SECTIONS
38+
{
39+
.text :
40+
{
41+
KEEP(*(.isr_vector))
42+
*(.text.Reset_Handler)
43+
*(.text.SystemInit)
44+
45+
/* Only vectors and code running at reset are safe to be in first 512
46+
bytes since RAM can be mapped into this area for RAM based interrupt
47+
vectors. */
48+
. = 0x00000200;
49+
*(.text*)
50+
51+
KEEP(*(.init))
52+
KEEP(*(.fini))
53+
54+
/* .ctors */
55+
*crtbegin.o(.ctors)
56+
*crtbegin?.o(.ctors)
57+
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
58+
*(SORT(.ctors.*))
59+
*(.ctors)
60+
61+
/* .dtors */
62+
*crtbegin.o(.dtors)
63+
*crtbegin?.o(.dtors)
64+
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
65+
*(SORT(.dtors.*))
66+
*(.dtors)
67+
68+
*(.rodata*)
69+
70+
KEEP(*(.eh_frame*))
71+
} > FLASH
72+
73+
.ARM.extab :
74+
{
75+
*(.ARM.extab* .gnu.linkonce.armextab.*)
76+
} > FLASH
77+
78+
__exidx_start = .;
79+
.ARM.exidx :
80+
{
81+
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
82+
} > FLASH
83+
__exidx_end = .;
84+
85+
__etext = .;
86+
87+
.data : AT (__etext)
88+
{
89+
__data_start__ = .;
90+
*(vtable)
91+
*(.data*)
92+
93+
. = ALIGN(4);
94+
/* preinit data */
95+
PROVIDE (__preinit_array_start = .);
96+
KEEP(*(.preinit_array))
97+
PROVIDE (__preinit_array_end = .);
98+
99+
. = ALIGN(4);
100+
/* init data */
101+
PROVIDE (__init_array_start = .);
102+
KEEP(*(SORT(.init_array.*)))
103+
KEEP(*(.init_array))
104+
PROVIDE (__init_array_end = .);
105+
106+
107+
. = ALIGN(4);
108+
/* finit data */
109+
PROVIDE (__fini_array_start = .);
110+
KEEP(*(SORT(.fini_array.*)))
111+
KEEP(*(.fini_array))
112+
PROVIDE (__fini_array_end = .);
113+
114+
. = ALIGN(4);
115+
/* All data end */
116+
__data_end__ = .;
117+
118+
} > RAM
119+
120+
.bss :
121+
{
122+
__bss_start__ = .;
123+
*(.bss*)
124+
*(COMMON)
125+
__bss_end__ = .;
126+
} > RAM
127+
128+
.heap :
129+
{
130+
__end__ = .;
131+
end = __end__;
132+
*(.heap*)
133+
__HeapLimit = .;
134+
} > RAM
135+
136+
/* .stack_dummy section doesn't contains any symbols. It is only
137+
* used for linker to calculate size of stack sections, and assign
138+
* values to stack symbols later */
139+
.stack_dummy :
140+
{
141+
*(.stack)
142+
} > RAM
143+
144+
/* Set stack top to end of RAM, and stack limit move down by
145+
* size of stack_dummy section */
146+
__StackTop = ORIGIN(RAM) + LENGTH(RAM);
147+
__StackLimit = __StackTop - SIZEOF(.stack_dummy);
148+
PROVIDE(__stack = __StackTop);
149+
150+
/* Check if data + heap + stack exceeds RAM limit */
151+
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
152+
}

‎libraries/rtos/rtx/RTX_CM_lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
205205
#elif defined(TARGET_LPC11U24)
206206
#define INITIAL_SP (0x10002000UL)
207207

208-
#elif defined(TARGET_LPC11U35_401)
208+
#elif defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501)
209209
#define INITIAL_SP (0x10002000UL)
210210

211211
#elif defined(TARGET_LPC1114)

‎libraries/rtos/rtx/RTX_Conf_CM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#ifndef OS_TASKCNT
5252
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
5353
# define OS_TASKCNT 14
54-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
54+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
5555
# define OS_TASKCNT 6
5656
# endif
5757
#endif
@@ -60,7 +60,7 @@
6060
#ifndef OS_SCHEDULERSTKSIZE
6161
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
6262
# define OS_SCHEDULERSTKSIZE 256
63-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
63+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
6464
# define OS_SCHEDULERSTKSIZE 128
6565
# endif
6666
#endif
@@ -107,7 +107,7 @@
107107
# elif defined(TARGET_LPC1347)
108108
# define OS_CLOCK 72000000
109109

110-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z)
110+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z)
111111
# define OS_CLOCK 48000000
112112
#
113113
# elif defined(TARGET_LPC812)

‎workspace_tools/build_release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
('LPC1347', ('ARM',)),
3535
('LPC4088', ('ARM', 'GCC_ARM', 'GCC_CR')),
3636
('LPC1114', ('uARM','GCC_ARM')),
37-
('LPC11U35_401', ('ARM', 'uARM')),
38-
('LPC11U35_501', ('ARM', 'uARM')),
37+
('LPC11U35_401', ('ARM', 'uARM','GCC_ARM','GCC_CR')),
38+
('LPC11U35_501', ('ARM', 'uARM','GCC_ARM','GCC_CR')),
3939
('LPC1549', ('uARM',)),
4040

4141
('KL05Z', ('ARM', 'uARM', 'GCC_ARM')),

‎workspace_tools/export/gccarm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class GccArm(Exporter):
2222
NAME = 'GccArm'
2323
TOOLCHAIN = 'GCC_ARM'
24-
TARGETS = ['LPC1768','KL05Z','KL25Z','KL46Z','K20D5M','LPC4088','LPC11U24','LPC1114']
24+
TARGETS = ['LPC1768','KL05Z','KL25Z','KL46Z','K20D5M','LPC4088','LPC11U24','LPC1114','LPC11U35_401','LPC11U35_501']
2525
DOT_IN_RELATIVE_PATH = True
2626

2727
def generate(self):

‎workspace_tools/export_test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ def test_export(toolchain, target, expected_error=None):
9090
# Windows path: C:/arm-none-eabi-gcc-4_7/bin/
9191
('gcc_arm', 'LPC1768'),
9292
('gcc_arm', 'LPC1114'),
93+
('gcc_arm', 'LPC11U35_401'),
94+
('gcc_arm', 'LPC11U35_501'),
95+
9396

9497
('ds5_5', 'LPC1768'), ('ds5_5', 'LPC11U24'),
9598

‎workspace_tools/targets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ def __init__(self):
387387

388388
self.extra_labels = ['NXP', 'LPC11UXX']
389389

390-
self.supported_toolchains = ["ARM", "uARM","GCC_CR"]
390+
self.supported_toolchains = ["ARM", "uARM","GCC_ARM","GCC_CR"]
391391

392392

393393
class UBLOX_C027(Target):

0 commit comments

Comments
 (0)