Fix HEAP and CSTACK placement for IAR on NRF51 and NRF52.

ARMmbed · Jul 26, 2016 · 9a92da8 · 9a92da8
1 parent d3d6c81
commit 9a92da8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...ET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf b/...ET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf
@@ -29,15 +29,15 @@ keep { section .intvec };
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 place in ROM_region   { readonly };
 place in RAM_region   { readwrite,
-                        block CSTACK,
-                        block HEAP };
-                        
+                        block HEAP,
+                        block CSTACK };
+
 /*This is used for mbed applications build inside the Embedded workbench
 Applications build with the python scritps use a hex merge so need to merge it
 inside the linker. The linker can only use binary files so the hex merge is not possible
 through the linker. That is why a binary is used instead of a hex image for the embedded project.
 */
-if(isdefinedsymbol(SOFT_DEVICE_BIN)) 
+if(isdefinedsymbol(SOFT_DEVICE_BIN))
 {
   place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
-}
+}
diff --git a/...ET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf b/...ET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf
@@ -30,15 +30,15 @@ keep { section .intvec };
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 place in ROM_region   { readonly };
 place in RAM_region   { readwrite,
-                        block CSTACK,
-                        block HEAP };
-                        
+                        block HEAP,
+                        block CSTACK };
+
 /*This is used for mbed applications build inside the Embedded workbench
 Applications build with the python scritps use a hex merge so need to merge it
 inside the linker. The linker can only use binary files so the hex merge is not possible
 through the linker. That is why a binary is used instead of a hex image for the embedded project.
 */
-if(isdefinedsymbol(SOFT_DEVICE_BIN)) 
+if(isdefinedsymbol(SOFT_DEVICE_BIN))
 {
   place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
 }
diff --git a/hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_IAR/nRF52832.icf b/hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_IAR/nRF52832.icf
@@ -32,15 +32,15 @@ keep { section .intvec };
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 place in ROM_region   { readonly };
 place in RAM_region   { readwrite,
-                        block CSTACK,
-                        block HEAP };
-                        
+                        block HEAP,
+                        block CSTACK };
+
 /*This is used for mbed applications build inside the Embedded workbench
 Applications build with the python scritps use a hex merge so need to merge it
 inside the linker. The linker can only use binary files so the hex merge is not possible
 through the linker. That is why a binary is used instead of a hex image for the embedded project.
 */
-if(isdefinedsymbol(SOFT_DEVICE_BIN)) 
+if(isdefinedsymbol(SOFT_DEVICE_BIN))
 {
   place at address mem:__code_start_soft_device__ { section .noinit_softdevice };
 }