LPC1114 - linker script & startup code improvement

Author: toyowata

targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_ARM_STD/TARGET_LPC11XX/LPC1114.sct

@@ -1,22 +1,48 @@
 #! armcc -E
 
+#if !defined(MBED_APP_START)
+  #define MBED_APP_START            0x00000000
+#endif
+
+; 32K flash
+#if !defined(MBED_APP_SIZE)
+  #define MBED_APP_SIZE             0x8000
+#endif
+
+; 4KB
+#if !defined(MBED_RAM_START)
+  #define MBED_RAM_START            0x10000000
+#endif
+
+#if !defined(MBED_RAM_SIZE)
+  #define MBED_RAM_SIZE             0x00001000
+#endif
+
+
 #if !defined(MBED_BOOT_STACK_SIZE)
-  #define MBED_BOOT_STACK_SIZE 0x400
+  #define MBED_BOOT_STACK_SIZE      0x400
 #endif
 
-#define Stack_Size MBED_BOOT_STACK_SIZE
+; 8_byte_aligned(48 vect * 4 bytes) =  8_byte_aligned(0xC0) = 0xC0
+#define VECTOR_SIZE                 0xC0
+
+#define RAM_FIXED_SIZE              (MBED_BOOT_STACK_SIZE+VECTOR_SIZE)
 
-LR_IROM1 0x00000000 0x8000  {    ; load region size_region (32k)
-  ER_IROM1 0x00000000 0x8000  {  ; load address = execution address
+LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {    ; load region size_region
+
+  ER_IROM1  MBED_APP_START  MBED_APP_SIZE  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-  ; 8_byte_aligned(48 vect * 4 bytes) =  8_byte_aligned(0xC0) = 0xC0
-  ; 8KB - 0xC0 = 0xF40
-  RW_IRAM1 0x100000C0 0xF40-Stack_Size  {
+
+  RW_IRAM1  (MBED_RAM_START+VECTOR_SIZE)  (MBED_RAM_SIZE-VECTOR_SIZE)  {  ; RW data
    .ANY (+RW +ZI)
   }
-  ARM_LIB_STACK (0x100000C0+0xF40) EMPTY -Stack_Size { ; stack
+
+  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16))  {
+  }
+
+  ARM_LIB_STACK  (MBED_RAM_START+MBED_RAM_SIZE)  EMPTY  -MBED_BOOT_STACK_SIZE { ; stack
   }
 }

targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_GCC_ARM/TARGET_LPC11XX/LPC1114.ld

@@ -46,9 +46,9 @@ SECTIONS
     .text :
     {
         KEEP(*(.isr_vector))
-		*(.text.Reset_Handler)
+        *(.text.Reset_Handler)
         *(.text.SystemInit)
-		. = 0x200;
+        . = 0x200;
         *(.text*)
 
         KEEP(*(.init))
@@ -95,24 +95,24 @@ SECTIONS
 
         . = ALIGN(8);
         /* preinit data */
-        PROVIDE (__preinit_array_start = .);
+        PROVIDE_HIDDEN (__preinit_array_start = .);
         KEEP(*(.preinit_array))
-        PROVIDE (__preinit_array_end = .);
+        PROVIDE_HIDDEN (__preinit_array_end = .);
 
         . = ALIGN(8);
         /* init data */
-        PROVIDE (__init_array_start = .);
+        PROVIDE_HIDDEN (__init_array_start = .);
         KEEP(*(SORT(.init_array.*)))
         KEEP(*(.init_array))
-        PROVIDE (__init_array_end = .);
+        PROVIDE_HIDDEN (__init_array_end = .);
 
 
         . = ALIGN(8);
         /* finit data */
-        PROVIDE (__fini_array_start = .);
+        PROVIDE_HIDDEN (__fini_array_start = .);
         KEEP(*(SORT(.fini_array.*)))
         KEEP(*(.fini_array))
-        PROVIDE (__fini_array_end = .);
+        PROVIDE_HIDDEN (__fini_array_end = .);
 
         . = ALIGN(8);
         /* All data end */
@@ -128,7 +128,7 @@ SECTIONS
         __bss_end__ = .;
     } > RAM
 
-    .heap :
+    .heap (COPY):
     {
         __end__ = .;
         end = __end__;
@@ -140,7 +140,7 @@ SECTIONS
     /* .stack_dummy section doesn't contains any symbols. It is only
      * used for linker to calculate size of stack sections, and assign
      * values to stack symbols later */
-    .stack_dummy :
+    .stack_dummy (COPY):
     {
         *(.stack)
     } > RAM
@@ -153,4 +153,4 @@ SECTIONS
 
     /* Check if data + heap + stack exceeds RAM limit */
     ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
-}
+}

targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_GCC_ARM/startup_LPC11xx.S

@@ -44,36 +44,7 @@
    aborting compilation, it is not the run time limit:
    Heap_Size + Stack_Size = 0x80 + 0x80 = 0x100
  */
-    .section .stack
-    .align 3
-#ifdef __STACK_SIZE
-    .equ    Stack_Size, __STACK_SIZE
-#else
-    .equ    Stack_Size, 0x80
-#endif
-    .globl    __StackTop
-    .globl    __StackLimit
-__StackLimit:
-    .space    Stack_Size
-    .size __StackLimit, . - __StackLimit
-__StackTop:
-    .size __StackTop, . - __StackTop
 
-    .section .heap
-    .align 3
-#ifdef __HEAP_SIZE
-    .equ    Heap_Size, __HEAP_SIZE
-#else
-    .equ    Heap_Size, 0x80
-#endif
-    .globl    __HeapBase
-    .globl    __HeapLimit
-__HeapBase:
-    .space    Heap_Size
-    .size __HeapBase, . - __HeapBase
-__HeapLimit:
-    .size __HeapLimit, . - __HeapLimit
-    
     .section .isr_vector
     .align 2
     .globl __isr_vector
@@ -210,6 +181,5 @@ Reset_Handler:
     def_irq_default_handler    PIOINT2_IRQHandler
     def_irq_default_handler    PIOINT1_IRQHandler
     def_irq_default_handler    PIOINT0_IRQHandler
-    def_irq_default_handler    DEF_IRQHandler
 
     .end