Merge branch 'bugfix/heap_in_flash_v5.4' into 'release/v5.4'

fix(heap): fixed CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH not working together with CONFIG_HEAP_TLSF_USE_ROM_IMPL (v5.4)

See merge request espressif/esp-idf!38121
This commit is contained in:
Marius Vikhammer
2025-05-12 11:50:39 +08:00
2 changed files with 3 additions and 3 deletions

View File

@ -121,12 +121,11 @@ menu "Heap memory debugging"
config HEAP_PLACE_FUNCTION_INTO_FLASH
bool "Force the entire heap component to be placed in flash memory"
depends on !HEAP_TLSF_USE_ROM_IMPL
default n
help
Enable this flag to save up RAM space by placing the heap component in the flash memory
Note that it is only safe to enable this configuration if no functions from esp_heap_caps.h
or esp_heap_trace.h are called from ISR.
or esp_heap_trace.h are called from IRAM ISR which runs when cache is disabled.
endmenu

View File

@ -1,7 +1,8 @@
[mapping:newlib]
archive: libnewlib.a
entries:
heap (noflash)
if HEAP_PLACE_FUNCTION_INTO_FLASH = n:
heap (noflash)
abort (noflash)
assert (noflash)
stdatomic (noflash)