Merge pull request #14142 from hugueskamba/hk_heap_size_fix_stm32l4

0xc0170 · web-flow · commit 5f541b22d092 · 2021-01-20T14:58:45.000Z
STM32L4: Correct heap size formula
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TOOLCHAIN_ARM/stm32l443xc.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TOOLCHAIN_ARM/stm32l443xc.sct
@@ -102,7 +102,7 @@ LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {    ; load region size_region
    .ANY (+RW +ZI)
   }
 
-  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16))  {
+  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE-(AlignExpr(ImageLimit(RW_IRAM1), 16)-MBED_RAM_START))  {
   }
 
   RW_IRAM2  MBED_IRAM2_START  MBED_IRAM2_SIZE  {
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TOOLCHAIN_ARM/stm32l452xe.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TOOLCHAIN_ARM/stm32l452xe.sct
@@ -68,7 +68,7 @@ LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {
    .ANY (+RW +ZI)
   }
 
-  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16))  { ; Heap growing up
+  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE-(AlignExpr(ImageLimit(RW_IRAM1), 16)-MBED_RAM_START))  { ; Heap growing up
   }
 
   RW_IRAM2  MBED_IRAM2_START  MBED_IRAM2_SIZE  {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`102`	`102`	`.ANY (+RW +ZI)`
`103`	`103`	`}`
`104`	`104`
`105`		`- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
	`105`	`+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE-(AlignExpr(ImageLimit(RW_IRAM1), 16)-MBED_RAM_START)) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`RW_IRAM2 MBED_IRAM2_START MBED_IRAM2_SIZE {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {`
`68`	`68`	`.ANY (+RW +ZI)`
`69`	`69`	`}`
`70`	`70`
`71`		`- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up`
	`71`	`+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE-(AlignExpr(ImageLimit(RW_IRAM1), 16)-MBED_RAM_START)) { ; Heap growing up`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`RW_IRAM2 MBED_IRAM2_START MBED_IRAM2_SIZE {`