changes needed to support V7 of the nRF51822 soft-device 110

Author: Rohit Grover

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/nRF51822.sct

@@ -1,24 +1,24 @@
 ;WITHOUT SOFTDEVICE:
-;LR_IROM1 0x00000000 0x00040000  {    
-;  ER_IROM1 0x00000000 0x00040000  {  
+;LR_IROM1 0x00000000 0x00040000  {
+;  ER_IROM1 0x00000000 0x00040000  {
 ;   *.o (RESET, +First)
 ;   *(InRoot$$Sections)
 ;   .ANY (+RO)
 ;  }
-;  RW_IRAM1 0x20000000 0x00004000  { 
+;  RW_IRAM1 0x20000000 0x00004000  {
 ;   .ANY (+RW +ZI)
 ;  }
 ;}
 ;
 ;WITH SOFTDEVICE:
 
-LR_IROM1 0x14000 0x002C000  {    
-  ER_IROM1 0x14000 0x002C000  {  
+LR_IROM1 0x16000 0x002A000  {
+  ER_IROM1 0x16000 0x002A000  {
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-  RW_IRAM1 0x20002000 0x00002000  { 
+  RW_IRAM1 0x20002000 0x00002000  {
    .ANY (+RW +ZI)
   }
 }

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_GCC_ARM/NRF51822.ld

@@ -2,8 +2,8 @@
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00014000, LENGTH = 0x2C000 
-  RAM (rwx) :  ORIGIN = 0x20002000, LENGTH = 0x2000 
+  FLASH (rx) : ORIGIN = 0x00016000, LENGTH = 0x2A000
+  RAM (rwx) :  ORIGIN = 0x20002000, LENGTH = 0x2000
 }
 
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
@@ -12,7 +12,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
  * with other linker script that defines memory regions FLASH and RAM.
  * It references following symbols, which must be defined in code:
  *   Reset_Handler : Entry of reset handler
- * 
+ *
  * It defines following symbols, which code can use without definition:
  *   __exidx_start
  *   __exidx_end
@@ -64,9 +64,9 @@ SECTIONS
 
 		*(.eh_frame*)
 	} > FLASH
-    
 
-	.ARM.extab : 
+
+	.ARM.extab :
 	{
 		*(.ARM.extab* .gnu.linkonce.armextab.*)
 	} > FLASH
@@ -79,7 +79,7 @@ SECTIONS
 	__exidx_end = .;
 
 	__etext = .;
-		
+
 	.data : AT (__etext)
 	{
 		__data_start__ = .;
@@ -123,7 +123,7 @@ SECTIONS
 		. = ALIGN(4);
 		__bss_end__ = .;
 	} > RAM
-	
+
 	.heap (COPY):
 	{
 		__end__ = .;
@@ -145,7 +145,7 @@ SECTIONS
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
 	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
 	PROVIDE(__stack = __StackTop);
-	
+
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
 }