diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
index 9cd1df5290..76c8f0ec39 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
@@ -22,6 +22,14 @@
   #define MBED_APP_SIZE 0x100000
 #endif
 
+#if !defined(MBED_RAM_START)
+#define MBED_RAM_START 0x20000000
+#endif
+
+#if !defined(MBED_RAM_SIZE)
+#define MBED_RAM_SIZE 0x30000
+#endif
+
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
 #  if defined(MBED_BOOT_STACK_SIZE)
 #    define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
@@ -31,6 +39,11 @@
 #endif
 
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
+#define VECTOR_SIZE 0x320
+
+#define RAM_FIXED_SIZE (MBED_CONF_TARGET_BOOT_STACK_SIZE + VECTOR_SIZE)
+#define MBED_IRAM1_START (MBED_RAM_START + VECTOR_SIZE)
+#define MBED_IRAM1_SIZE (MBED_RAM_SIZE - VECTOR_SIZE - Stack_Size)
 
 ; TMPM46B: 1024 KB FLASH (0x100000) + 512 KB SRAM (0x80000)
 
@@ -43,12 +56,13 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE ; load region size_region
    .ANY (+RO)
   }
 
-  RW_IRAM1 0x200001E0 (0x80000 - 0x1E0 - Stack_Size)
+  RW_IRAM1 MBED_IRAM1_START MBED_IRAM1_SIZE
   {
-     tmpm46b_fc.o(+RO)
+     tmpm4g9_fc.o (+RO)
     .ANY (+RW, +ZI)
   }
-  
-  ARM_LIB_STACK (0x20000000+0x80000) EMPTY -Stack_Size { ; stack
+  ARM_LIB_HEAP AlignExpr(+0, 16)  EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_IRAM1_START)) { ; heap
+  }
+  ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack
   }
 }
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
index da01cabd00..e209aac9c2 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
@@ -38,6 +38,14 @@
   #define MBED_APP_SIZE 0x000180000
 #endif
 
+#if !defined(MBED_RAM_START)
+#define MBED_RAM_START 0x20000000
+#endif
+
+#if !defined(MBED_RAM_SIZE)
+#define MBED_RAM_SIZE 0x30000
+#endif
+
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
 #  if defined(MBED_BOOT_STACK_SIZE)
 #    define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
@@ -47,6 +55,11 @@
 #endif
 
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
+#define VECTOR_SIZE 0x320
+
+#define RAM_FIXED_SIZE (MBED_CONF_TARGET_BOOT_STACK_SIZE + VECTOR_SIZE)
+#define MBED_IRAM1_START (MBED_RAM_START + VECTOR_SIZE)
+#define MBED_IRAM1_SIZE (MBED_RAM_SIZE - VECTOR_SIZE - Stack_Size)
 
 ; TMPM4G9: 1536 KB FLASH (0x180000) + 192 KB SRAM (0x30000)
 
@@ -58,13 +71,13 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE ; load region size_region
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-
-  RW_IRAM1 0x20000320 (0x30000 - 0x320 - Stack_Size)
+  RW_IRAM1 MBED_IRAM1_START MBED_IRAM1_SIZE
   {
      tmpm4g9_fc.o (+RO)
     .ANY (+RW, +ZI)
   }
-
-  ARM_LIB_STACK (0x20000000+0x30000) EMPTY -Stack_Size { ; stack
+  ARM_LIB_HEAP AlignExpr(+0, 16)  EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_IRAM1_START)) { ; heap
+  }
+  ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack
   }
 }
diff --git a/targets/targets.json b/targets/targets.json
index 76f7fd73d0..e53d733408 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -6358,7 +6358,18 @@
         "release_versions": [
             "5"
         ],
-        "bootloader_supported": true
+        "bootloader_supported": true,
+        "supported_application_profiles" : ["full", "bare-metal"],
+        "supported_c_libs": {
+            "arm": [
+                "std",
+                "small"
+            ],
+            "gcc_arm": [
+                "std",
+                "small"
+            ]
+        }
     },
     "ARM_FM": {
         "inherits": [
@@ -6647,7 +6658,18 @@
         "release_versions": [
             "5"
         ],
-        "bootloader_supported": true
+        "bootloader_supported": true,
+        "supported_application_profiles" : ["full", "bare-metal"],
+        "supported_c_libs": {
+            "arm": [
+                "std",
+                "small"
+            ],
+            "gcc_arm": [
+                "std",
+                "small"
+            ]
+        }
     },
     "MCU_PSOC6": {
         "inherits": [