alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-24 01:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/heap-in-flash' into 'master'

Browse Source 
heap: Add a configuration that places all the heap component in flash

Closes IDF-7143 and IDF-2853

See merge request espressif/esp-idf!23050
This commit is contained in:
Guillaume Souchere
2023-04-13 14:38:15 +08:00
parent d8b8ab5d43 110aac240d
commit 48932ce910
13 changed files with 134 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/heap/test_apps/heap_tests/main/test_malloc_caps.c
View File

@@ -174,7 +174,7 @@ TEST_CASE("heap_caps metadata test", "[heap]")
/* Small function runs from IRAM to check that malloc/free/realloc
all work OK when cache is disabled...
*/
#ifndef CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
#if !CONFIG_ESP_SYSTEM_MEMPROT_FEATURE && !CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH
static IRAM_ATTR __attribute__((noinline)) bool iram_malloc_test(void)
{
spi_flash_guard_get()->start(); // Disables flash cache

13
components/heap/test_apps/heap_tests/pytest_heap.py
View File

@@ -19,6 +19,19 @@ def test_heap_poisoning(dut: Dut) -> None:
dut.run_all_single_board_cases()
@pytest.mark.generic
@pytest.mark.esp32
@pytest.mark.esp32c6
@pytest.mark.parametrize(
'config',
[
'in_flash'
]
)
def test_heap_in_flash(dut: Dut) -> None:
dut.run_all_single_board_cases()
@pytest.mark.generic
@pytest.mark.esp32
@pytest.mark.esp32s2

2
components/heap/test_apps/heap_tests/sdkconfig.ci.in_flash Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_HEAP_TLSF_USE_ROM_IMPL=n
CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y