From fd4e8e27781ee2e1df644548ccb31bd80b6b7e16 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 7 Mar 2023 15:13:52 +0000 Subject: [PATCH] ensure _heap_end symbol excludes reserved for boot section --- esp32-hal/ld/memory.x | 2 +- esp32s2-hal/ld/memory.x | 2 +- esp32s3-hal/ld/memory.x | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esp32-hal/ld/memory.x b/esp32-hal/ld/memory.x index 745bc91ce..a268368b1 100644 --- a/esp32-hal/ld/memory.x +++ b/esp32-hal/ld/memory.x @@ -171,7 +171,7 @@ SECTIONS { _external_ram_start = ABSOLUTE(ORIGIN(psram_seg)); _external_ram_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg)); -_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)+LENGTH(reserved_for_boot_seg) - 2*STACK_SIZE; +_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)-LENGTH(reserved_for_boot_seg) - 2*STACK_SIZE; _text_heap_end = ABSOLUTE(ORIGIN(iram_seg)+LENGTH(iram_seg)); _external_heap_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg)); diff --git a/esp32s2-hal/ld/memory.x b/esp32s2-hal/ld/memory.x index 2e2a50635..2012d9e29 100644 --- a/esp32s2-hal/ld/memory.x +++ b/esp32s2-hal/ld/memory.x @@ -164,7 +164,7 @@ SECTIONS { _external_ram_start = ABSOLUTE(ORIGIN(psram_seg)); _external_ram_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg)); -_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)+LENGTH(reserved_for_boot_seg) - STACK_SIZE; +_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)-LENGTH(reserved_for_boot_seg) - STACK_SIZE; _text_heap_end = ABSOLUTE(ORIGIN(iram_seg)+LENGTH(iram_seg)); _external_heap_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg)); diff --git a/esp32s3-hal/ld/memory.x b/esp32s3-hal/ld/memory.x index 7e0b4595b..d6e436c1d 100644 --- a/esp32s3-hal/ld/memory.x +++ b/esp32s3-hal/ld/memory.x @@ -162,7 +162,7 @@ SECTIONS { _external_ram_start = ABSOLUTE(ORIGIN(psram_seg)); _external_ram_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg)); -_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)+LENGTH(reserved_for_boot_seg) - 2*STACK_SIZE; +_heap_end = ABSOLUTE(ORIGIN(dram_seg))+LENGTH(dram_seg)-LENGTH(reserved_for_boot_seg) - 2*STACK_SIZE; _text_heap_end = ABSOLUTE(ORIGIN(iram_seg)+LENGTH(iram_seg)); _external_heap_end = ABSOLUTE(ORIGIN(psram_seg)+LENGTH(psram_seg));