Merge pull request #14132 from hugueskamba/hk_heap_size_fix_apollo3

0xc0170 · web-flow · commit 96aa1bb067d4 · 2021-01-20T08:37:22.000Z
Apollo3: Fix heap size formula and stack start address in scatter file
diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TOOLCHAIN_ARM_STD/AMA3B1KK.sct b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TOOLCHAIN_ARM_STD/AMA3B1KK.sct
@@ -56,8 +56,8 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {
   RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE {
    .ANY (+RW +ZI)
   }
-  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_RAM1_START+MBED_RAM1_SIZE-8 EMPTY -Stack_Size { ; Stack region growing down
+  ARM_LIB_STACK MBED_RAM1_START+MBED_RAM1_SIZE EMPTY -Stack_Size { ; Stack region growing down
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {`
`56`	`56`	`RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE {`
`57`	`57`	`.ANY (+RW +ZI)`
`58`	`58`	`}`
`59`		`- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
	`59`	`+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM1_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
`60`	`60`	`}`
`61`		`- ARM_LIB_STACK MBED_RAM1_START+MBED_RAM1_SIZE-8 EMPTY -Stack_Size { ; Stack region growing down`
	`61`	`+ ARM_LIB_STACK MBED_RAM1_START+MBED_RAM1_SIZE EMPTY -Stack_Size { ; Stack region growing down`
`62`	`62`	`}`
`63`	`63`	`}`