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

Merge branch 'docs/rtc_heap_mem_description' into 'master'

Browse Source 
fix(system): fixed docs for ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP, enabled on H2

See merge request espressif/esp-idf!33537
This commit is contained in:
Marius Vikhammer
2024-10-10 16:31:07 +08:00
parent 7e76d2e435 3e443a9033
commit 331abf74ff
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/esp_system/Kconfig
View File

@@ -92,14 +92,8 @@ menu "ESP System Settings"
config ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK config ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK
bool bool
default y if IDF_TARGET_ESP32 && ESP_SYSTEM_SINGLE_CORE_MODE default n if IDF_TARGET_ESP32 && !ESP_SYSTEM_SINGLE_CORE_MODE
default y if IDF_TARGET_ESP32S2 default y
default y if IDF_TARGET_ESP32C3
default y if IDF_TARGET_ESP32S3
default y if IDF_TARGET_ESP32C6
default n if IDF_TARGET_ESP32H2 # IDF-5667
default y if IDF_TARGET_ESP32P4
default y if IDF_TARGET_ESP32C5
depends on SOC_RTC_FAST_MEM_SUPPORTED depends on SOC_RTC_FAST_MEM_SUPPORTED
config ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP config ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
@@ -108,9 +102,8 @@ menu "ESP System Settings"
depends on ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK depends on ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK
help help
This config option allows to add RTC fast memory region to system heap with capability This config option allows to add RTC fast memory region to system heap with capability
similar to that of DRAM region but without DMA. This memory will be consumed first per similar to that of DRAM region but without DMA. Speed wise RTC fast memory operates on
heap initialization order by early startup services and scheduler related code. Speed APB clock and hence does not have much performance impact.
wise RTC fast memory operates on APB clock and hence does not have much performance impact.
config ESP_SYSTEM_USE_EH_FRAME config ESP_SYSTEM_USE_EH_FRAME
bool "Generate and use eh_frame for backtracing" bool "Generate and use eh_frame for backtracing"

5
components/mbedtls/test_apps/main/test_aes.c
View File

@@ -1540,7 +1540,8 @@ static void __attribute__((unused)) aes_ctr_stream_test_task(void *pv)
vTaskDelete(NULL); vTaskDelete(NULL);
} }
#if CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK #if CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK && !CONFIG_IDF_TARGET_ESP32H2
// Not enough rtc memory for test on H2
TEST_CASE("mbedtls AES stack in RTC RAM", "[mbedtls]") TEST_CASE("mbedtls AES stack in RTC RAM", "[mbedtls]")
{ {
@@ -1561,7 +1562,7 @@ TEST_CASE("mbedtls AES stack in RTC RAM", "[mbedtls]")
vSemaphoreDelete(done_sem); vSemaphoreDelete(done_sem);
} }
#endif //CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK #endif //CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK && !CONFIG_IDF_TARGET_ESP32H2
#if CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM && CONFIG_SPIRAM_USE_MALLOC #if CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM && CONFIG_SPIRAM_USE_MALLOC

3
components/mbedtls/test_apps/main/test_mbedtls_sha.c
View File

@@ -563,7 +563,8 @@ TEST_CASE("mbedtls SHA256 PSRAM DMA large buffer", "[hw_crypto]")
#endif //CONFIG_SPIRAM_USE_MALLOC #endif //CONFIG_SPIRAM_USE_MALLOC
#if CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK #if CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK && !CONFIG_IDF_TARGET_ESP32H2
// Not enough rtc memory for test on H2
TEST_CASE("mbedtls SHA stack in RTC RAM", "[mbedtls]") TEST_CASE("mbedtls SHA stack in RTC RAM", "[mbedtls]")
{ {