feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

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

Browse Source 
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
parent fd37cd46b2 cccccd6da8
commit fe75355314
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/heap/Kconfig
View File

@@ -121,12 +121,11 @@ menu "Heap memory debugging"
config HEAP_PLACE_FUNCTION_INTO_FLASH config HEAP_PLACE_FUNCTION_INTO_FLASH
bool "Force the entire heap component to be placed in flash memory" bool "Force the entire heap component to be placed in flash memory"
depends on !HEAP_TLSF_USE_ROM_IMPL
default n default n
help help
Enable this flag to save up RAM space by placing the heap component in the flash memory 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 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 endmenu

3
components/newlib/newlib.lf
View File

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