TARGET_Arm_SSG: ISR stack size unification

Unify ISR stack size for targets which support MBED 5 (or MBED 2 and MBED 5).

 MBED 5 : 0 boards
----------------

 MBED 2, 5 : 2 boards
----------------
ARM_CM3DS_MPS2
ARM_BEETLE_SOC

 MBED 2 : 6 boards (skipped)
----------------
ARM_MPS2_M0
ARM_MPS2_M3
ARM_MPS2_M4
ARM_MPS2_M7
ARM_MPS2_M0P
ARM_IOTSS_BEID

Author: mprse

targets/TARGET_ARM_SSG/TARGET_BEETLE/device/TOOLCHAIN_ARM_STD/BEETLE.sct

@@ -1,3 +1,6 @@
+#! armcc -E
+#include "mbed_config.h"
+
 ;/*
 ; * BEETLE CMSIS Library
 ; */
@@ -22,6 +25,16 @@
 ; *** Scatter-Loading Description File                      ***
 ; *************************************************************
 
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #if (defined(MBED_CONF_RTOS_PRESENT))
+    #define Stack_Size                   0x0400
+  #else
+    #define Stack_Size                   0x1000
+  #endif
+#endif
+
 LR_IROM1 0x00000000 0x00040000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00040000  {  ; load address = execution address
    *.o (RESET, +FIRST)
@@ -30,7 +43,10 @@ LR_IROM1 0x00000000 0x00040000  {    ; load region size_region
    CORDIO_RO_2.1.o (*)
   }
   ; Total: 80 vectors = 320 bytes (0x140) to be reserved in RAM
-  RW_IRAM1 (0x20000000+0x140) (0x20000-0x140)  {  ; RW data
+  RW_IRAM1 (0x20000000+0x140) (0x20000-0x140-Stack_Size)  {  ; RW data
    .ANY (+RW +ZI)
   }
+  
+  ARM_LIB_STACK (0x20000000 + 0x20000) EMPTY -Stack_Size { ; Stack region growing down
+  }
 }

targets/TARGET_ARM_SSG/TARGET_BEETLE/device/TOOLCHAIN_GCC_ARM/BEETLE.ld

@@ -59,10 +59,6 @@ MEMORY
  */
 ENTRY(Reset_Handler)
 
-/* Heap 1/4 of ram and stack 1/8 */
-__stack_size__ = 0x4000;
-__heap_size__ = 0x8000;
-
 HEAP_SIZE  = DEFINED(__heap_size__)  ? __heap_size__  : 0x0400;
 STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
 
@@ -202,11 +198,17 @@ SECTIONS
         __end__ = .;
         PROVIDE(end = .);
         __HeapBase = .;
-        . += HEAP_SIZE;
+        . = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
         __HeapLimit = .;
         __heap_limit = .; /* Add for _sbrk */
     } > RAM
 
+    .stack_dummy :
+    {
+        *(.stack)
+        . += Stack_Size;
+    } > RAM
+
     /* Set stack top to end of RAM, and stack limit move down by
      * size of stack_dummy section */
     __StackTop = ORIGIN(RAM) + LENGTH(RAM);

targets/TARGET_ARM_SSG/TARGET_BEETLE/device/TOOLCHAIN_GCC_ARM/startup_BEETLE.S

@@ -24,6 +24,19 @@
     .syntax unified
     .arch armv7-m
 
+    .section .stack
+    .align 3
+#ifdef __STACK_SIZE
+    .equ    Stack_Size, __STACK_SIZE
+#else
+    #if defined(MBED_CONF_RTOS_PRESENT)
+      .equ    Stack_Size, 0x400
+    #else
+      .equ    Stack_Size, 0x1000
+    #endif
+#endif
+    .globl    Stack_Size
+
     .section .vector_table,"a",%progbits
     .align 2
     .globl __isr_vector

targets/TARGET_ARM_SSG/TARGET_BEETLE/device/TOOLCHAIN_IAR/BEETLE.icf

@@ -30,7 +30,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000140;
 define symbol __ICFEDIT_region_RAM_end__      = 0x2001FFFF;
 /*-Sizes-*/
 /* Heap and Stack size */
-define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_cstack__ = 0x400;
 define symbol __ICFEDIT_size_heap__   = 0x4000;
 /**** End of ICF editor section. ###ICF###*/
 

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_ARM_STD/MPS2.sct

@@ -1,4 +1,5 @@
 #! armcc -E
+#include "mbed_config.h"
 
 /*
  * MPS2 CMSIS Library
@@ -29,6 +30,16 @@
 #include "../memory_zones.h"
 #include "../cmsis_nvic.h"
 
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #if (defined(MBED_CONF_RTOS_PRESENT))
+    #define Stack_Size                   0x0400
+  #else
+    #define Stack_Size                   0x1000
+  #endif
+#endif
+
 ; The vector table is loaded at address 0x00000000 in Flash memory region.
 LR_IROM1 FLASH_START FLASH_SIZE  {
   ER_IROM1 FLASH_START FLASH_SIZE  {
@@ -44,8 +55,10 @@ LR_IROM2 ZBT_SSRAM1_START ZBT_SSRAM1_SIZE {
   }
   ; At execution, RAM is set to be in ZBT SSRAM2 and 3, just after the vector
   ; table previously moved from Flash.
-  RW_IRAM1 (ZBT_SSRAM23_START + NVIC_VECTORS_SIZE) (ZBT_SSRAM23_SIZE - NVIC_VECTORS_SIZE)  {
+  RW_IRAM1 (ZBT_SSRAM23_START + NVIC_VECTORS_SIZE) (ZBT_SSRAM23_SIZE - NVIC_VECTORS_SIZE - Stack_Size)  {
    .ANY (+RW +ZI)
   }
+  ARM_LIB_STACK (ZBT_SSRAM23_START + ZBT_SSRAM23_SIZE) EMPTY -Stack_Size { ; Stack region growing down
+  }
 }
 

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_GCC_ARM/MPS2.ld

@@ -60,9 +60,6 @@ MEMORY
  */
 ENTRY(Reset_Handler)
 
-HEAP_SIZE  = 0x4000;
-STACK_SIZE = 0x1000;
-
 /* Size of the vector table in SRAM */
 M_VECTOR_RAM_SIZE = NVIC_VECTORS_SIZE;
 
@@ -192,15 +189,21 @@ SECTIONS
         __end__ = .;
         PROVIDE(end = .);
         __HeapBase = .;
-        . += HEAP_SIZE;
+        . = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
         __HeapLimit = .;
         __heap_limit = .; /* Add for _sbrk */
     } > RAM
 
+    .stack_dummy :
+    {
+        *(.stack)
+        . += Stack_Size;
+    } > RAM
+
     /* Set stack top to end of RAM, and stack limit move down by
      * size of stack_dummy section */
     __StackTop = ORIGIN(RAM) + LENGTH(RAM);
-    __StackLimit = __StackTop - STACK_SIZE;
+    __StackLimit = __StackTop - Stack_Size;
     PROVIDE(__stack = __StackTop);
 
     /* Check if data + heap + stack exceeds RAM limit */

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S

@@ -24,6 +24,19 @@
     .syntax unified
     .arch armv7-m
 
+    .section .stack
+    .align 3
+#ifdef __STACK_SIZE
+    .equ    Stack_Size, __STACK_SIZE
+#else
+    #if defined(MBED_CONF_RTOS_PRESENT)
+      .equ    Stack_Size, 0x400
+    #else
+      .equ    Stack_Size, 0x1000
+    #endif
+#endif
+    .globl    Stack_Size
+
     .section .vector_table,"a",%progbits
     .align 2
     .globl __isr_vector

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_IAR/MPS2.icf

@@ -58,7 +58,7 @@ define symbol __ICFEDIT_region_RAM_end__      = ZBT_SSRAM23_START + ZBT_SSRAM23_
 /* Sizes */
 /* Heap and Stack size */
 define symbol __ICFEDIT_size_heap__   = 0xF000;
-define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_cstack__ = 0x400;
 
 define memory mem with size = 4G;
 define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];