Only sort .text for nrf

Author: tannewt

ports/nrf/boards/common.template.ld

@@ -73,32 +73,32 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH_FIRMWARE
 
-    /* used by the startup to initialize data */
-    _sidata = .;
-
     /* This is the initialized data section
     The program executes knowing that the data is in the RAM
     but the loader puts the initial values in the FLASH (inidata).
     It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data : AT (_sidata)
+    .data :
     {
         . = ALIGN(4);
         _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
         _ram_start = .;    /* create a global symbol at ram start for garbage collector */
-        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.data))           /* .data sections */
-        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*))          /* .data* sections */
+        *(.data)           /* .data sections */
+        *(.data*)          /* .data* sections */
 
         . = ALIGN(4);
         _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >APP_RAM
+    } >APP_RAM AT > FLASH_FIRMWARE
+
+    /* used by the startup to initialize data */
+    _sidata = LOADADDR(.data);
 
     /* Zero-initialized data section */
     .bss :
     {
         . = ALIGN(4);
         _sbss = .;         /* define a global symbol at bss start; used by startup code */
-        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss))
-        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))
+        *(.bss)
+        *(.bss*)
         *(COMMON)
 
         . = ALIGN(4);