Skip to content

Commit a0ba4e6

Browse files
committed
Pull up EFM32 linker and startup files to latest SDK version.
1 parent 764d54f commit a0ba4e6

File tree

23 files changed

+27
-182
lines changed

23 files changed

+27
-182
lines changed

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/TOOLCHAIN_ARM_MICRO/startup_efm32gg.S

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32gg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32GG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -269,27 +269,8 @@ EMU_IRQHandler
269269

270270
; User Initial Stack & Heap
271271

272-
IF :DEF:__MICROLIB
273-
274272
EXPORT __initial_sp
275273
EXPORT __heap_base
276274
EXPORT __heap_limit
277275

278-
ELSE
279-
280-
IMPORT __use_two_region_memory
281-
EXPORT __user_initial_stackheap
282-
283-
__user_initial_stackheap PROC
284-
LDR R0, = Heap_Mem
285-
LDR R1, =(Stack_Mem + Stack_Size)
286-
LDR R2, = (Heap_Mem + Heap_Size)
287-
LDR R3, = Stack_Mem
288-
BX LR
289-
ENDP
290-
291-
ALIGN
292-
293-
ENDIF
294-
295276
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/TOOLCHAIN_ARM_STD/startup_efm32gg.S

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32gg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32GG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -269,14 +269,6 @@ EMU_IRQHandler
269269

270270
; User Initial Stack & Heap
271271

272-
IF :DEF:__MICROLIB
273-
274-
EXPORT __initial_sp
275-
EXPORT __heap_base
276-
EXPORT __heap_limit
277-
278-
ELSE
279-
280272
IMPORT __use_two_region_memory
281273
EXPORT __user_initial_stackheap
282274

@@ -290,6 +282,4 @@ __user_initial_stackheap PROC
290282

291283
ALIGN
292284

293-
ENDIF
294-
295285
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/TOOLCHAIN_GCC_ARM/efm32gg.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* */
77
/* Silicon Laboratories, Inc. 2015 */
88
/* */
9-
/* Version 4.1.0 */
9+
/* Version 4.2.0 */
1010
/* */
1111

1212
MEMORY

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/TOOLCHAIN_GCC_ARM/startup_efm32gg.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @file startup_efm32gg.S
22
* @brief startup file for Silicon Labs EFM32GG devices.
33
* For use with GCC for ARM Embedded Processors
4-
* @version 4.1.0
4+
* @version 4.2.1
55
* Date: 12 June 2014
66
*
77
*/

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/TOOLCHAIN_ARM_MICRO/startup_efm32hg.S

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32hg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32HG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -195,27 +195,8 @@ TIMER2_IRQHandler
195195

196196
; User Initial Stack & Heap
197197

198-
IF :DEF:__MICROLIB
199-
200198
EXPORT __initial_sp
201199
EXPORT __heap_base
202200
EXPORT __heap_limit
203201

204-
ELSE
205-
206-
IMPORT __use_two_region_memory
207-
EXPORT __user_initial_stackheap
208-
209-
__user_initial_stackheap PROC
210-
LDR R0, = Heap_Mem
211-
LDR R1, =(Stack_Mem + Stack_Size)
212-
LDR R2, = (Heap_Mem + Heap_Size)
213-
LDR R3, = Stack_Mem
214-
BX LR
215-
ENDP
216-
217-
ALIGN
218-
219-
ENDIF
220-
221202
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/TOOLCHAIN_GCC_ARM/efm32hg.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* */
77
/* Silicon Laboratories, Inc. 2015 */
88
/* */
9-
/* Version 4.1.0 */
9+
/* Version 4.2.0 */
1010
/* */
1111

1212
MEMORY

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/TOOLCHAIN_GCC_ARM/startup_efm32hg.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @file startup_efm32hg.S
22
* @brief startup file for Silicon Labs EFM32HG devices.
33
* For use with GCC for ARM Embedded Processors
4-
* @version 4.1.0
4+
* @version 4.2.1
55
* Date: 12 June 2014
66
*
77
*/

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/TOOLCHAIN_ARM_MICRO/startup_efm32lg.S

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32lg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32LG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -263,35 +263,15 @@ MSC_IRQHandler
263263
AES_IRQHandler
264264
EBI_IRQHandler
265265
EMU_IRQHandler
266-
267266
B .
268267
ENDP
269268

270269
ALIGN
271270

272271
; User Initial Stack & Heap
273272

274-
IF :DEF:__MICROLIB
275-
276273
EXPORT __initial_sp
277274
EXPORT __heap_base
278275
EXPORT __heap_limit
279276

280-
ELSE
281-
282-
IMPORT __use_two_region_memory
283-
EXPORT __user_initial_stackheap
284-
285-
__user_initial_stackheap PROC
286-
LDR R0, = Heap_Mem
287-
LDR R1, =(Stack_Mem + Stack_Size)
288-
LDR R2, = (Heap_Mem + Heap_Size)
289-
LDR R3, = Stack_Mem
290-
BX LR
291-
ENDP
292-
293-
ALIGN
294-
295-
ENDIF
296-
297277
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/TOOLCHAIN_ARM_STD/startup_efm32lg.S

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32lg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32LG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -35,6 +35,7 @@ Stack_Size EQU 0x00000400
3535
Stack_Mem SPACE Stack_Size
3636
__initial_sp EQU 0x20008000
3737

38+
3839
; <h> Heap Configuration
3940
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
4041
; </h>
@@ -262,22 +263,13 @@ MSC_IRQHandler
262263
AES_IRQHandler
263264
EBI_IRQHandler
264265
EMU_IRQHandler
265-
266266
B .
267267
ENDP
268268

269269
ALIGN
270270

271271
; User Initial Stack & Heap
272272

273-
IF :DEF:__MICROLIB
274-
275-
EXPORT __initial_sp
276-
EXPORT __heap_base
277-
EXPORT __heap_limit
278-
279-
ELSE
280-
281273
IMPORT __use_two_region_memory
282274
EXPORT __user_initial_stackheap
283275

@@ -291,6 +283,4 @@ __user_initial_stackheap PROC
291283

292284
ALIGN
293285

294-
ENDIF
295-
296286
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/TOOLCHAIN_GCC_ARM/efm32lg.ld

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
/* */
77
/* Silicon Laboratories, Inc. 2015 */
88
/* */
9-
/* Version 4.1.0 */
9+
/* Version 4.2.0 */
1010
/* */
1111

1212
MEMORY
1313
{
1414
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 262144
1515
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 32768
1616
}
17-
1817
/* MBED: mbed needs to be able to dynamically set the interrupt vector table.
1918
* We make room for the table at the very beginning of RAM, i.e. at
2019
* 0x20000000. We need (16+40) * sizeof(uint32_t) = 224 bytes for EFM32LG */

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/TOOLCHAIN_GCC_ARM/startup_efm32lg.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @file startup_efm32lg.S
22
* @brief startup file for Silicon Labs EFM32LG devices.
33
* For use with GCC for ARM Embedded Processors
4-
* @version 4.1.0
4+
* @version 4.2.1
55
* Date: 12 June 2014
66
*
77
*/

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_ARM_MICRO/startup_efm32pg1b.S

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32pg1b.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32PG1B Device Series
5-
; * @version 4.2.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -235,27 +235,8 @@ FPUEH_IRQHandler
235235

236236
; User Initial Stack & Heap
237237

238-
IF :DEF:__MICROLIB
239-
240238
EXPORT __initial_sp
241239
EXPORT __heap_base
242240
EXPORT __heap_limit
243241

244-
ELSE
245-
246-
IMPORT __use_two_region_memory
247-
EXPORT __user_initial_stackheap
248-
249-
__user_initial_stackheap PROC
250-
LDR R0, = Heap_Mem
251-
LDR R1, =(Stack_Mem + Stack_Size)
252-
LDR R2, = (Heap_Mem + Heap_Size)
253-
LDR R3, = Stack_Mem
254-
BX LR
255-
ENDP
256-
257-
ALIGN
258-
259-
ENDIF
260-
261242
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_ARM_STD/startup_efm32pg1b.S

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32pg1b.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32PG1B Device Series
5-
; * @version 4.2.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -235,14 +235,6 @@ FPUEH_IRQHandler
235235

236236
; User Initial Stack & Heap
237237

238-
IF :DEF:__MICROLIB
239-
240-
EXPORT __initial_sp
241-
EXPORT __heap_base
242-
EXPORT __heap_limit
243-
244-
ELSE
245-
246238
IMPORT __use_two_region_memory
247239
EXPORT __user_initial_stackheap
248240

@@ -256,6 +248,4 @@ __user_initial_stackheap PROC
256248

257249
ALIGN
258250

259-
ENDIF
260-
261251
END

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_GCC_ARM/efm32pg1b.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* */
77
/* Silicon Laboratories, Inc. 2015 */
88
/* */
9-
/* Version 4.1.0 */
9+
/* Version 4.2.0 */
1010
/* */
1111

1212
MEMORY
@@ -17,7 +17,7 @@ MEMORY
1717

1818
/* MBED: mbed needs to be able to dynamically set the interrupt vector table.
1919
* We make room for the table at the very beginning of RAM, i.e. at
20-
* 0x20000000. We need (16+34) * sizeof(uint32_t) = 200 bytes for EFM32LG */
20+
* 0x20000000. We need (16+34) * sizeof(uint32_t) = 200 bytes for EFM32PG */
2121
__vector_size = 0xC8;
2222

2323
/* Linker script to place sections and symbol values. Should be used together

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_GCC_ARM/startup_efm32pg1b.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @file startup_efm32pg1b.S
22
* @brief startup file for Silicon Labs EFM32PG1B devices.
33
* For use with GCC for ARM Embedded Processors
4-
* @version 4.2.0
4+
* @version 4.2.1
55
* Date: 12 June 2014
66
*
77
*/

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_IAR/startup_efm32pg1b.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32pg1b.s
33
; * @brief CMSIS Core Device Startup File
44
; * Silicon Labs EFM32PG1B Device Series
5-
; * @version 4.2.0
5+
; * @version 4.2.1
66
; * @date 30. January 2012
77
; *
88
; * @note

libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/TOOLCHAIN_ARM_MICRO/startup_efm32wg.S

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; * @file startup_efm32wg.s
33
; * @brief CMSIS Core Device Startup File for
44
; * Silicon Labs EFM32WG Device Series
5-
; * @version 4.1.0
5+
; * @version 4.2.1
66
; * @date 03. February 2012
77
; *
88
; * @note
@@ -272,27 +272,8 @@ FPUEH_IRQHandler
272272

273273
; User Initial Stack & Heap
274274

275-
IF :DEF:__MICROLIB
276-
277275
EXPORT __initial_sp
278276
EXPORT __heap_base
279277
EXPORT __heap_limit
280278

281-
ELSE
282-
283-
IMPORT __use_two_region_memory
284-
EXPORT __user_initial_stackheap
285-
286-
__user_initial_stackheap PROC
287-
LDR R0, = Heap_Mem
288-
LDR R1, =(Stack_Mem + Stack_Size)
289-
LDR R2, = (Heap_Mem + Heap_Size)
290-
LDR R3, = Stack_Mem
291-
BX LR
292-
ENDP
293-
294-
ALIGN
295-
296-
ENDIF
297-
298279
END

0 commit comments

Comments
 (0)