diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct
index 5288d9a..f6d738a 100644
--- a/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct
+++ b/targets/TARGET_Samsung/TARGET_SIDK_S1SBP6A/device/TOOLCHAIN_ARM_STD/s1sbp6a.sct
@@ -69,6 +69,11 @@
     #define STACK_SIZE  MBED_CONF_TARGET_BOOT_STACK_SIZE
 #endif
 
+#define RAM_FIXED_SIZE (MBED_CONF_TARGET_BOOT_STACK_SIZE + NVIC_VECTORS_SIZE)
+
+#define MBED_RAM1_START (MBED_RAM_START + NVIC_VECTORS_SIZE)
+#define MBED_RAM1_SIZE (MBED_RAM_SIZE - NVIC_VECTORS_SIZE - STACK_SIZE)
+
 ; The vector table is loaded at address 0x00000000 in Flash  memory region.
 LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
   ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address
@@ -77,9 +82,11 @@
    *(+RO)
   }
   ; NVIC_VECTORS_SIZE Total
-  RW_IRAM1 (MBED_RAM_START + NVIC_VECTORS_SIZE) (MBED_RAM_SIZE - NVIC_VECTORS_SIZE - STACK_SIZE)  {  ; RW data
+  RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE  {  ; RW data
    *(+RW +ZI)
   }
+  ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)) { ; Heap growing up
+  }
   ARM_LIB_STACK (MBED_RAM_START + MBED_RAM_SIZE) EMPTY - STACK_SIZE { ; Stack region growing down
   }
 }
diff --git a/targets/targets.json b/targets/targets.json
index 76f7fd7..9553ce9 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -7503,7 +7503,6 @@
         "core": "Cortex-M7",
         "supported_toolchains": [
             "GCC_ARM",
-            "IAR",
             "ARMC6"
         ],
         "default_toolchain": "GCC_ARM",
@@ -7559,7 +7558,7 @@
         "core": "Cortex-M4F",
         "supported_toolchains": [
             "GCC_ARM",
-            "ARMC6"
+            "ARM"
         ],
         "default_toolchain": "GCC_ARM",
         "extra_labels": [
@@ -7579,7 +7578,20 @@
             "WATCHDOG"
         ],
         "release_versions": ["5"],
-        "detect_code": ["3703"]
+        "detect_code": ["3703"],
+        "supported_c_libs": {
+            "arm": [
+                "std",
+                "small"
+            ],
+            "gcc_arm": [
+                "std",
+                "small"
+            ]
+        },
+        "supported_application_profiles": [
+            "full", "bare-metal"
+        ]
     },
     "FAMILY_Apollo3": {
         "inherits": ["Target"],