Merge pull request #2687 from nvlsianpu/add_fs_data_secton_gcc

[NRF5] Add fs_data symbol in data secton for gcc
ARMmbed · Sep 16, 2016 · 27c6e25 · 27c6e25
2 parents 5920896 + 55fbdd1
commit 27c6e25
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/...RGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld b/...RGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld
@@ -107,6 +107,11 @@ SECTIONS
 		KEEP(*(.fini_array))
 		PROVIDE_HIDDEN (__fini_array_end = .);
 
+		. = ALIGN(4);
+		PROVIDE(__start_fs_data = .);
+		KEEP(*(.fs_data))
+		PROVIDE(__stop_fs_data = .);
+
 		*(.jcr)
 		. = ALIGN(4);
 		/* All data end */
@@ -116,13 +121,6 @@ SECTIONS
 
     __edata = .;
 
-    .fs_data :
-    {
-      PROVIDE(__start_fs_data = .);
-      KEEP(*(.fs_data))
-      PROVIDE(__stop_fs_data = .);
-    } > RAM
-
 	.bss :
 	{
 		. = ALIGN(4);

diff --git a/..._NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld b/..._NRF5/TARGET_MCU_NRF51822_UNIFIED/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld
@@ -106,6 +106,11 @@ SECTIONS
 		KEEP(*(SORT(.fini_array.*)))
 		KEEP(*(.fini_array))
 		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		. = ALIGN(4);
+		PROVIDE(__start_fs_data = .);
+		KEEP(*(.fs_data))
+		PROVIDE(__stop_fs_data = .);
 
 		*(.jcr)
 		. = ALIGN(4);

diff --git a/...targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_GCC_ARM/NRF52832.ld b/...targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_GCC_ARM/NRF52832.ld
@@ -126,6 +126,11 @@ SECTIONS
         KEEP(*(.fini_array))
         PROVIDE_HIDDEN (__fini_array_end = .);
 
+        . = ALIGN(4);
+        PROVIDE(__start_fs_data = .);
+        KEEP(*(.fs_data))
+        PROVIDE(__stop_fs_data = .);
+
         *(.jcr)
         . = ALIGN(4);
         /* All data end */
@@ -135,13 +140,6 @@ SECTIONS
 
     __edata = .;
 
-    .fs_data :
-    {
-      PROVIDE(__start_fs_data = .);
-      KEEP(*(.fs_data))
-      PROVIDE(__stop_fs_data = .);
-    } > RAM
-
     .bss :
     {
         . = ALIGN(4);