Merge pull request ARMmbed#102 from linlingao/fix_heap

Fix heap size for gcc_arm

Author: linlingao

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/TOOLCHAIN_GCC_ARM/gcc_arm.ld

@@ -29,6 +29,7 @@
      * Case 2: MBED_APP_START is defined as a value greater than ROM_START, this is most likely a build other than the bootloader. E.g., the MCC build.
      *         In this build, exclude FLASH_HDR region. This workarounds an issue in managed boodloader MCC build where the jump address and stack pointer point to the cookie area
      */
+        #undef FLASH_HDR_INCLUDED
         #define FLASH_HDR_INCLUDED 0
         #define ROM_EXEC_START  MBED_APP_START
         #if defined(MBED_APP_SIZE)
@@ -51,6 +52,13 @@
      #endif
 #endif
 
+#if !defined(MBED_BOOT_STACK_SIZE)
+    #define MBED_BOOT_STACK_SIZE 0x400
+#endif
+
+STACK_SIZE = MBED_BOOT_STACK_SIZE;
+
+
 MEMORY
 {
     FLASH_HDR (rx) : ORIGIN = FLASH_HDR_START, LENGTH = FLASH_HDR_SIZE
@@ -183,9 +191,11 @@ SECTIONS
 
     .heap (COPY):
     {
+        . = ALIGN(4);
         __end__ = .;
-        PROVIDE(end = .);
+        end = __end__;
         *(.heap*)
+        . = ORIGIN(RAM) + LENGTH(RAM) - STACK_SIZE;
         __HeapLimit = .;
     } > RAM
 
@@ -200,7 +210,7 @@ SECTIONS
     /* 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_TI/TARGET_CC32XX/TARGET_CC3220SF/device/TOOLCHAIN_GCC_ARM/startup_CC3220SF.S

@@ -49,29 +49,6 @@ __StackLimit:
 __StackTop:
 .size __StackTop, . - __StackTop
 
-/*
-// <h> Heap Configuration
-//   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
-// </h>
-*/
-
-.section .heap
-.align 3
-#ifdef __HEAP_SIZE
-.equ    Heap_Size, __HEAP_SIZE
-#else
-.equ    Heap_Size, 0xA000
-#endif
-.globl    __HeapBase
-.globl    __HeapLimit
-__HeapBase:
-.if    Heap_Size
-.space    Heap_Size
-.endif
-.size __HeapBase, . - __HeapBase
-__HeapLimit:
-.size __HeapLimit, . - __HeapLimit
-
     .section .isr_vector
     .align 2
     .globl    __Vectors

targets/targets.json

@@ -8149,9 +8149,12 @@
     },
     "CC3220SF_LAUNCHXL": {
         "inherits": ["CC3220SF"],
-        "components": ["SD"],
+        "components": ["SD", "FLASHIAP"],
         "device_has": ["USTICKER", "SERIAL", "SERIAL_FC", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "INTERRUPTIN", "SPI", "ANALOGIN", "FLASH", "TRNG", "RTC"],
-        "bootloader_supported": true
+        "bootloader_supported": true,
+        "overrides": {
+            "network-default-interface-type": "WIFI"
+        }
     },
     "TMPM4G9": {
         "inherits": ["Target"],