Merge pull request #1889 from svastm/fix_rtos_uarm_l4

[STM32L4XX] Fix heap size for RTOS on uARM
ARMmbed · Jun 13, 2016 · f03943c · f03943c
2 parents bb8994b + fe2871b
commit f03943c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s → ...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.S b/...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s → ...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.S
@@ -42,13 +42,13 @@
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
                 EXPORT  __initial_sp
 
-__initial_sp    EQU     0x10008000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
+__initial_sp    EQU     0x20018000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
 
 ; <h> Heap Configuration
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x18000 ; 96KB
+Heap_Size       EQU     0x17800 ; 94KB (96KB, -2*1KB for main thread and scheduler)
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
                 EXPORT  __heap_base

diff --git a/...s/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct b/...s/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct
@@ -36,12 +36,11 @@ LR_IROM1 0x08000000 0x100000  {    ; load region size_region
    .ANY (+RO)
   }
 
-  ; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
-  RW_IRAM1 (0x10000000+0x188) (0x08000-0x188)  {  ; RW data 32k L4-ECC-SRAM2 retained in standby
+  RW_IRAM1 0x20000000 0x00018000  { ; RW data 96k L4-SRAM1
    .ANY (+RW +ZI)
   }
-
-  RW_IRAM2 0x20000000 0x00018000  { ; RW data 96k L4-SRAM1
+ ; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
+  RW_IRAM2 (0x10000000+0x188) (0x08000-0x188)  {  ; RW data 32k L4-ECC-SRAM2 retained in standby
    .ANY (+RW +ZI)
   }
 

diff --git a/...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s → ...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.S b/...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s → ...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.S
diff --git a/...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.s → ...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.S b/...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.s → ...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.S
diff --git a/...476VG/TOOLCHAIN_IAR/startup_stm32l476xx.s → ...476VG/TOOLCHAIN_IAR/startup_stm32l476xx.S b/...476VG/TOOLCHAIN_IAR/startup_stm32l476xx.s → ...476VG/TOOLCHAIN_IAR/startup_stm32l476xx.S
diff --git a/...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s → ...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.S b/...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s → ...TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.S
@@ -48,7 +48,7 @@ __initial_sp    EQU     0x20018000 ; Top of RAM, L4-ECC-SRAM2 retained in standb
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x18000 ; 96KB
+Heap_Size       EQU     0x17800 ; 94KB (96KB, -2*1KB for main thread and scheduler)
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
                 EXPORT  __heap_base

diff --git a/...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s → ...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.S b/...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s → ...G/TOOLCHAIN_ARM_STD/startup_stm32l476xx.S
diff --git a/...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.s → ...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.S b/...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.s → ...G/TOOLCHAIN_GCC_ARM/startup_stm32l476xx.S
diff --git a/...476RG/TOOLCHAIN_IAR/startup_stm32l476xx.s → ...476RG/TOOLCHAIN_IAR/startup_stm32l476xx.S b/...476RG/TOOLCHAIN_IAR/startup_stm32l476xx.s → ...476RG/TOOLCHAIN_IAR/startup_stm32l476xx.S