TARGET_TOSHIBA: ISR stack size unification

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

 MBED 5 : 3 boards
----------------
TMPM3H6
TMPM46B
TMPM066
 MBED 2, 5 : 0 boards
----------------
 MBED 2 : 0 boards (skipped)
----------------

Author: mprse

targets/TARGET_TOSHIBA/TARGET_TMPM066/device/TOOLCHAIN_ARM_STD/tmpm066fwug.sct

@@ -1,3 +1,5 @@
+#! armcc -E
+#include "mbed_config.h"
 ;;  TMPM066FWUG scatter file
 
 ;;  Vector table starts at 0
@@ -13,6 +15,16 @@
 
 ;; Compatible with ISSM model
 
+#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 0x20000
 {
   ER_IROM1 0x00000000 0x20000
@@ -25,8 +37,11 @@ LR_IROM1 0x00000000 0x20000
   }
 
   /* 8_byte_aligned(32 + 16 vect * 4 bytes) =  8_byte_aligned(0xC0) */
-  RW_IRAM1 0x200000C0 (0x4000 - 0xC0)
+  RW_IRAM1 0x200000C0 (0x4000 - 0xC0 - Stack_Size)
   {
     .ANY (+RW, +ZI)
   }
+  
+  ARM_LIB_STACK 0x200000C0+0x4000 EMPTY -Stack_Size { ; Stack region growing down
+  }
 }

targets/TARGET_TOSHIBA/TARGET_TMPM066/device/TOOLCHAIN_GCC_ARM/startup_TMPM066.S

@@ -26,14 +26,18 @@
 .section .stack
 .align 3
 #ifdef __STACK_SIZE
-.equ    Stack_Size, __STACK_SIZE
+    .equ    Stack_Size, __STACK_SIZE
 #else
-.equ    Stack_Size, 0x400
+    #if defined(MBED_CONF_RTOS_PRESENT)
+      .equ    Stack_Size, 0x400
+    #else
+      .equ    Stack_Size, 0x1000
+    #endif
 #endif
 .globl    __StackTop
 .globl    __StackLimit
 __StackLimit:
-.space    Stack_Size
+.globl    Stack_Size
 .size __StackLimit, . - __StackLimit
 __StackTop:
 .size __StackTop, . - __StackTop

targets/TARGET_TOSHIBA/TARGET_TMPM066/device/TOOLCHAIN_GCC_ARM/tmpm066fwug.ld

@@ -128,6 +128,7 @@ SECTIONS
         __end__ = .;
         end = __end__;
         *(.heap*)
+        . = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
         __HeapLimit = .;
     } > RAM
 
@@ -137,12 +138,13 @@ SECTIONS
     .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 - SIZEOF(.stack_dummy);
+    __StackLimit = __StackTop - Stack_Size;
     PROVIDE(__stack = __StackTop);
 
     /* Check if data + heap + stack exceeds RAM limit */

targets/TARGET_TOSHIBA/TARGET_TMPM066/device/TOOLCHAIN_IAR/tmpm066fwug.icf

@@ -9,7 +9,7 @@ define symbol __ICFEDIT_region_ROM_end__   = 0x0001FFFF;
 define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__   = 0x20003FFF;
 /*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ 	= 0x200;
+define symbol __ICFEDIT_size_cstack__ 	= 0x400;
 define symbol __ICFEDIT_size_heap__   	= 0x1400;
 /**** End of ICF editor section. ###ICF###*/
 

targets/TARGET_TOSHIBA/TARGET_TMPM3H6/device/TOOLCHAIN_ARM_STD/tmpm3h6fwfg.sct

@@ -1,3 +1,5 @@
+#! armcc -E
+#include "mbed_config.h"
 ;;  TMPM3H6FWFG scatter file
 
 ;;  Vector table starts at 0
@@ -13,6 +15,16 @@
 
 ;; Compatible with ISSM model
 
+#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 0x20000
 {
   ER_IROM1 0x00000000 0x20000
@@ -26,4 +38,6 @@ LR_IROM1 0x00000000 0x20000
   {
     .ANY (+RW, +ZI)
   }
+  ARM_LIB_STACK 0x20000000+0x4000 EMPTY -Stack_Size { ; Stack region growing down
+  }
 }

targets/TARGET_TOSHIBA/TARGET_TMPM3H6/device/TOOLCHAIN_GCC_ARM/startup_TMPM3H6.S

@@ -24,14 +24,18 @@
 */
 
 #ifdef __STACK_SIZE
-.equ    Stack_Size, __STACK_SIZE
+    .equ    Stack_Size, __STACK_SIZE
 #else
-.equ    Stack_Size, 0x400
+    #if defined(MBED_CONF_RTOS_PRESENT)
+      .equ    Stack_Size, 0x400
+    #else
+      .equ    Stack_Size, 0x1000
+    #endif
 #endif
 .globl    __StackTop
 .globl    __StackLimit
 __StackLimit:
-.space    Stack_Size
+.globl    Stack_Size
 .size __StackLimit, . - __StackLimit
 __StackTop:
 .size __StackTop, . - __StackTop

targets/TARGET_TOSHIBA/TARGET_TMPM3H6/device/TOOLCHAIN_GCC_ARM/tmpm3h6fwfg.ld

@@ -140,6 +140,7 @@ SECTIONS
         __end__ = .;
         end = __end__;
         KEEP(*(.heap*))
+        . = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
         __HeapLimit = .;
     } > RAM
 
@@ -149,12 +150,13 @@ SECTIONS
     .stack_dummy (COPY):
     {
         KEEP(*(.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 - SIZEOF(.stack_dummy);
+    __StackLimit = __StackTop - Stack_Size;
     PROVIDE(__stack = __StackTop);
 
     /* Check if data + heap + stack exceeds RAM limit */

targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct

@@ -1,4 +1,5 @@
 #! armcc -E -I. --cpu Cortex-M4
+#include "mbed_config.h"
 ;;  TMPM46BF10 scatter file
 
 ;;  Vector table starts at 0
@@ -14,6 +15,16 @@
 
 ;; Compatible with ISSM model
 
+#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
+
 #if !defined(MBED_APP_START)
   #define MBED_APP_START 0x00000000
 #endif
@@ -38,4 +49,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE ; load region size_region
      tmpm46b_fc.o(+RO)
     .ANY (+RW, +ZI)
   }
+  
+  ARM_LIB_STACK 0x200001E0+0x80000 EMPTY -Stack_Size { ; Stack region growing down
+  }
 }

targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_GCC_ARM/startup_TMPM46b.S

@@ -24,14 +24,18 @@
 */
 
 #ifdef __STACK_SIZE
-.equ    Stack_Size, __STACK_SIZE
+    .equ    Stack_Size, __STACK_SIZE
 #else
-.equ    Stack_Size, 0x400
+    #if defined(MBED_CONF_RTOS_PRESENT)
+      .equ    Stack_Size, 0x400
+    #else
+      .equ    Stack_Size, 0x1000
+    #endif
 #endif
 .globl    __StackTop
 .globl    __StackLimit
 __StackLimit:
-.space    Stack_Size
+.globl    Stack_Size
 .size __StackLimit, . - __StackLimit
 __StackTop:
 .size __StackTop, . - __StackTop

targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_GCC_ARM/tmpm46bf10fg.ld

@@ -185,6 +185,7 @@ SECTIONS
 		__end__ = .;
 		end = __end__;
 		KEEP(*(.heap*))
+		. = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
 		__HeapLimit = .;
 	} > RAM
 
@@ -194,12 +195,13 @@ SECTIONS
 	.stack_dummy (COPY):
 	{
 		KEEP(*(.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 - SIZEOF(.stack_dummy);
+	__StackLimit = __StackTop - Stack_Size;
 	PROVIDE(__stack = __StackTop);
 
 	/* Check if data + heap + stack exceeds RAM limit */

targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_IAR/tmpm46bf10fg.icf

@@ -13,8 +13,7 @@ define symbol __ICFEDIT_region_RAM_end__     = 0x2006FFFF;
 define symbol __ICFEDIT_region_BRAM_start__  = 0x20070000;
 define symbol __ICFEDIT_region_BRAM_end__    = 0x200807FF;
 /*-Sizes-*/
-/*Heap 1/4 of ram and stack 1/8*/
-define symbol __ICFEDIT_size_cstack__   = 0x10000;
+define symbol __ICFEDIT_size_cstack__   = 0x400;
 define symbol __ICFEDIT_size_heap__     = 0x20000;
 /**** End of ICF editor section. ###ICF###*/
 

targets/TARGET_TOSHIBA/mbed_rtx.h

@@ -17,28 +17,4 @@
 #ifndef MBED_MBED_RTX_H
 #define MBED_MBED_RTX_H
 
-#if defined(TARGET_TMPM066)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP                        (0x20004000UL)
-#endif
-
-#endif
-
-#if defined(TARGET_TMPM46B)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP                        (0x20080000UL)
-#endif
-
-#endif
-
-#if defined(TARGET_TMPM3H6)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP                        (0x20004000UL)
-#endif
-
-#endif
-
 #endif  // MBED_MBED_RTX_H