Merge pull request #14131 from hugueskamba/hk_heap_size_fix_arm_ssg

0xc0170 · web-flow · commit 549f887ce062 · 2021-01-11T13:39:11.000Z
MUSCA_B1: Fix heap size formula in scatter files
diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/device/TOOLCHAIN_ARMC6/musca_ns.sct b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/device/TOOLCHAIN_ARMC6/musca_ns.sct
@@ -39,6 +39,8 @@
 
 #define VECTOR_SIZE         NVIC_RAM_VECTOR_SIZE
 
+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)
+
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
 #  if defined(MBED_BOOT_STACK_SIZE)
 #    define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
@@ -55,12 +57,12 @@ LR_CODE  MBED_ROM_START  MBED_ROM_SIZE  {
         .ANY (+RO)
     }
 
-    RW_IRAM1  (MBED_RAM_START+VECTOR_SIZE)  (MBED_RAM_SIZE-VECTOR_SIZE)  {
+    RW_IRAM1  MBED_RAM1_START  (MBED_RAM_SIZE-VECTOR_SIZE)  {
         * (+RW) ; RW data that gets copied from Flash to SRAM
         * (+ZI) ; ZI data that gets initialised to zero in SRAM
     }
 
-    ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16))  {
+    ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM1_START-AlignExpr(ImageLimit(RW_IRAM1), 16))  {
     }
 
     ARM_LIB_STACK  (MBED_RAM_START+MBED_RAM_SIZE)  EMPTY  -MBED_CONF_TARGET_BOOT_STACK_SIZE { ; stack

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@`
`39`	`39`
`40`	`40`	`#define VECTOR_SIZE NVIC_RAM_VECTOR_SIZE`
`41`	`41`
	`42`	`+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)`
	`43`	`+`
`42`	`44`	`#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)`
`43`	`45`	`# if defined(MBED_BOOT_STACK_SIZE)`
`44`	`46`	`# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE`
`@@ -55,12 +57,12 @@ LR_CODE MBED_ROM_START MBED_ROM_SIZE {`
`55`	`57`	`.ANY (+RO)`
`56`	`58`	`}`
`57`	`59`
`58`		`- RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE) {`
	`60`	`+ RW_IRAM1 MBED_RAM1_START (MBED_RAM_SIZE-VECTOR_SIZE) {`
`59`	`61`	`* (+RW) ; RW data that gets copied from Flash to SRAM`
`60`	`62`	`* (+ZI) ; ZI data that gets initialised to zero in SRAM`
`61`	`63`	`}`
`62`	`64`
`63`		`- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
	`65`	`+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM1_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_CONF_TARGET_BOOT_STACK_SIZE { ; stack`