Merge pull request #14130 from hugueskamba/hk_heap_size_fix_nrf52840

0xc0170 · web-flow · commit 36a2a808a8c8 · 2021-01-12T08:22:31.000Z
NRF52840: Fix heap size formula in scatter files
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52840.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52840.sct
@@ -50,7 +50,7 @@ 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 EMPTY - Stack_Size { ; Stack region growing down
   }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {`
`50`	`50`	`RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE {`
`51`	`51`	`.ANY (+RW +ZI)`
`52`	`52`	`}`
`53`		`- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE + MBED_RAM_START - AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
	`53`	`+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE + MBED_RAM1_START - AlignExpr(ImageLimit(RW_IRAM1), 16)) {`
`54`	`54`	`}`
`55`	`55`	`ARM_LIB_STACK MBED_RAM1_START + MBED_RAM1_SIZE EMPTY - Stack_Size { ; Stack region growing down`
`56`	`56`	`}`