Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9a92da8

Browse files
committedJul 26, 2016
Fix HEAP and CSTACK placement for IAR on NRF51 and NRF52.
1 parent d3d6c81 commit 9a92da8

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed
 

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ keep { section .intvec };
2929
place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
3030
place in ROM_region { readonly };
3131
place in RAM_region { readwrite,
32-
block CSTACK,
33-
block HEAP };
34-
32+
block HEAP,
33+
block CSTACK };
34+
3535
/*This is used for mbed applications build inside the Embedded workbench
3636
Applications build with the python scritps use a hex merge so need to merge it
3737
inside the linker. The linker can only use binary files so the hex merge is not possible
3838
through the linker. That is why a binary is used instead of a hex image for the embedded project.
3939
*/
40-
if(isdefinedsymbol(SOFT_DEVICE_BIN))
40+
if(isdefinedsymbol(SOFT_DEVICE_BIN))
4141
{
4242
place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
43-
}
43+
}

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ keep { section .intvec };
3030
place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
3131
place in ROM_region { readonly };
3232
place in RAM_region { readwrite,
33-
block CSTACK,
34-
block HEAP };
35-
33+
block HEAP,
34+
block CSTACK };
35+
3636
/*This is used for mbed applications build inside the Embedded workbench
3737
Applications build with the python scritps use a hex merge so need to merge it
3838
inside the linker. The linker can only use binary files so the hex merge is not possible
3939
through the linker. That is why a binary is used instead of a hex image for the embedded project.
4040
*/
41-
if(isdefinedsymbol(SOFT_DEVICE_BIN))
41+
if(isdefinedsymbol(SOFT_DEVICE_BIN))
4242
{
4343
place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
4444
}

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_IAR/nRF52832.icf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ keep { section .intvec };
3232
place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
3333
place in ROM_region { readonly };
3434
place in RAM_region { readwrite,
35-
block CSTACK,
36-
block HEAP };
37-
35+
block HEAP,
36+
block CSTACK };
37+
3838
/*This is used for mbed applications build inside the Embedded workbench
3939
Applications build with the python scritps use a hex merge so need to merge it
4040
inside the linker. The linker can only use binary files so the hex merge is not possible
4141
through the linker. That is why a binary is used instead of a hex image for the embedded project.
4242
*/
43-
if(isdefinedsymbol(SOFT_DEVICE_BIN))
43+
if(isdefinedsymbol(SOFT_DEVICE_BIN))
4444
{
4545
place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
4646
}

0 commit comments

Comments
 (0)
Please sign in to comment.