Update linker script to Mbed CE standard

Author: multiplemonomials

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/PeripheralPins.c

@@ -67,6 +67,8 @@ const PinMap PinMap_I2C_testing[] = {
     {P0_23,  0, 0},
     {P0_24,  0, 0},
     {P0_25,  0, 0},
+    {P0_26,  0, 0},
+    {P0_27,  0, 0},
     {P0_28,  0, 0},
     {P0_29,  0, 0},
     {P0_30,  0, 0},
@@ -120,6 +122,8 @@ const PinMap PinMap_SPI_testing[] = {
     {P0_23,  0, 0},
     {P0_24,  0, 0},
     {P0_25,  0, 0},
+    {P0_26,  0, 0},
+    {P0_27,  0, 0},
     {P0_28,  0, 0},
     {P0_29,  0, 0},
     {P0_30,  0, 0},
@@ -173,6 +177,8 @@ const PinMap PinMap_UART_testing[] = {
     {P0_23,  0, 0},
     {P0_24,  0, 0},
     {P0_25,  0, 0},
+    {P0_26,  0, 0},
+    {P0_27,  0, 0},
     {P0_28,  0, 0},
     {P0_29,  0, 0},
     {P0_30,  0, 0},
@@ -226,6 +232,8 @@ const PinMap PinMap_PWM_testing[] = {
     {P0_23,  0, 0},
     {P0_24,  0, 0},
     {P0_25,  0, 0},
+    {P0_26,  0, 0},
+    {P0_27,  0, 0},
     {P0_28,  0, 0},
     {P0_29,  0, 0},
     {P0_30,  0, 0},
@@ -279,6 +287,8 @@ const PinMap PinMap_QSPI_testing[] = {
     {P0_23,  0, 0},
     {P0_24,  0, 0},
     {P0_25,  0, 0},
+    {P0_26,  0, 0},
+    {P0_27,  0, 0},
     {P0_28,  0, 0},
     {P0_29,  0, 0},
     {P0_30,  0, 0},

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_GCC_ARM/NRF52840.ld

@@ -16,42 +16,17 @@
 
 /* Linker script to configure memory regions. */
 
-/* Default to no softdevice */
-#if !defined(MBED_APP_START)
-  #define MBED_APP_START 0x0
-#endif
-
-#if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE 0x100000
-#endif
-
-#if !defined(MBED_RAM_START)
-  #define MBED_RAM_START 0x20000000
-  #define MBED_RAM_SIZE 0x40000
-#endif
-
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
     #define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x800
 #endif
-
-#define MBED_RAM0_START MBED_RAM_START
-#define MBED_RAM0_SIZE  0x100
-
-#define MBED_CRASH_REPORT_RAM_START (MBED_RAM0_START + MBED_RAM0_SIZE)
 #define MBED_CRASH_REPORT_RAM_SIZE  0x100
 
-#define MBED_RAM1_START (MBED_CRASH_REPORT_RAM_START + MBED_CRASH_REPORT_RAM_SIZE)
-#define MBED_RAM1_SIZE  (MBED_RAM_SIZE - (MBED_RAM0_SIZE + MBED_CRASH_REPORT_RAM_SIZE))
-
 MEMORY
 {
-  FLASH (rx)     : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
-  RAM_NVIC (rwx) : ORIGIN = MBED_RAM0_START, LENGTH = MBED_RAM0_SIZE
-  RAM_CRASH_DATA (rwx) : ORIGIN = MBED_CRASH_REPORT_RAM_START, LENGTH = MBED_CRASH_REPORT_RAM_SIZE
-  RAM (rwx)      : ORIGIN = MBED_RAM1_START, LENGTH = MBED_RAM1_SIZE
+  FLASH (rx)     : ORIGIN = MBED_CONFIGURED_ROM_BANK_IROM1_START, LENGTH = MBED_CONFIGURED_ROM_BANK_IROM1_SIZE
+  RAM (rwx)      : ORIGIN = MBED_RAM_BANK_IRAM1_START, LENGTH = MBED_RAM_BANK_IRAM1_SIZE
 }
 
-
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 
 /* Linker script to place sections and symbol values. Should be used together
@@ -84,6 +59,28 @@ ENTRY(Reset_Handler)
 
 SECTIONS
 {
+    /* RAM vector table */
+    .nvictable (NOLOAD) :
+    {
+      PROVIDE(__start_nvictable = .);
+      KEEP(*(.nvictable))
+      PROVIDE(__stop_nvictable = .);
+    } > RAM
+
+    /* Crash data RAM (preserved across resets) */
+    .crash_data_ram (NOLOAD):
+    {
+      . = ALIGN(8);
+      __CRASH_DATA_RAM__ = .;
+      __CRASH_DATA_RAM_START__ = .; /* Create a global symbol at data start */
+      . += MBED_CRASH_REPORT_RAM_SIZE;
+      __CRASH_DATA_RAM_END__ = .; /* Define a global symbol at data end */
+
+      /* Include any used-defined data in the crash data RAM */
+      KEEP(*(.keep.crash_data_ram))
+      *(.m_crash_data_ram)
+    } > RAM
+
     .text :
     {
         KEEP(*(.Vectors))
@@ -201,25 +198,6 @@ SECTIONS
 
     __edata = .;
 
-    .nvictable (NOLOAD) :
-    {
-      PROVIDE(__start_nvictable = .);
-      KEEP(*(.nvictable))
-      PROVIDE(__stop_nvictable = .);
-    } > RAM_NVIC
-    
-    .crash_data_ram :
-    {
-      . = ALIGN(8);
-      __CRASH_DATA_RAM__ = .;
-      __CRASH_DATA_RAM_START__ = .; /* Create a global symbol at data start */
-      KEEP(*(.keep.crash_data_ram))
-      *(.m_crash_data_ram)     /* This is a user defined section */
-      . += MBED_CRASH_REPORT_RAM_SIZE;
-      . = ALIGN(8);
-      __CRASH_DATA_RAM_END__ = .; /* Define a global symbol at data end */
-    } > RAM_CRASH_DATA
-
     .noinit (NOLOAD) :
     {
       PROVIDE(__start_noinit = .);

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/cmsis_nvic.h

@@ -35,20 +35,6 @@
 #define NVIC_NUM_VECTORS      (16 + 48)   // CORE + MCU Peripherals
 #define NVIC_USER_IRQ_OFFSET  16
 
-// RAM size defines, same as in the linker script
-#if !defined(MBED_APP_START)
-  #define MBED_APP_START 0x0
-#endif
-
-#if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE 0x100000
-#endif
-
-#if !defined(MBED_RAM_START)
-  #define MBED_RAM_START 0x20000000
-  #define MBED_RAM_SIZE 0x40000
-#endif
-
 #include "nrf.h"
 #include "cmsis.h"