espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(psram): rename .bss .noinit segments to sections

Browse Source 
Closes https://github.com/espressif/esp-idf/pull/15513
This commit is contained in:
armando
2025-03-10 14:42:50 +08:00
parent ed2b78e4ce
commit 9af8b5468c
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
components/esp_psram/esp_psram.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -307,30 +307,30 @@ static void s_psram_mapping(uint32_t psram_available_size, uint32_t start_page)
* After mapping, we DON'T care about the PSRAM PHYSICAL ADDRESS ANYMORE!
*----------------------------------------------------------------------------*/
//------------------------------------Configure heap in PSRAM-------------------------------------//
uintptr_t ext_segment_start = UINTPTR_MAX;
uintptr_t ext_segment_end = 0;
//------------------------------------Configure other sections in PSRAM-------------------------------------//
uintptr_t ext_section_start = UINTPTR_MAX;
uintptr_t ext_section_end = 0;
#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
ext_segment_start = (uintptr_t)&_ext_ram_bss_start;
ext_segment_end = (uintptr_t)&_ext_ram_bss_end;
ext_section_start = (uintptr_t)&_ext_ram_bss_start;
ext_section_end = (uintptr_t)&_ext_ram_bss_end;
#endif //#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
if ((uintptr_t)&_ext_ram_noinit_start < ext_segment_start) {
ext_segment_start = (uintptr_t)&_ext_ram_noinit_start;
if ((uintptr_t)&_ext_ram_noinit_start < ext_section_start) {
ext_section_start = (uintptr_t)&_ext_ram_noinit_start;
}
if ((uintptr_t)&_ext_ram_noinit_end > ext_segment_end) {
ext_segment_end = (uintptr_t)&_ext_ram_noinit_end;
if ((uintptr_t)&_ext_ram_noinit_end > ext_section_end) {
ext_section_end = (uintptr_t)&_ext_ram_noinit_end;
}
#endif //#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
if ((ext_segment_start != UINTPTR_MAX) || (ext_segment_end != 0)) {
assert(ext_segment_end >= ext_segment_start);
uint32_t ext_segment_size = ext_segment_end - ext_segment_start;
ESP_EARLY_LOGV(TAG, "ext_segment_size is %" PRIu32, ext_segment_size);
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start += ext_segment_size;
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= ext_segment_size;
if ((ext_section_start != UINTPTR_MAX) || (ext_section_end != 0)) {
assert(ext_section_end >= ext_section_start);
uint32_t ext_section_size = ext_section_end - ext_section_start;
ESP_EARLY_LOGV(TAG, "ext_section_size is %" PRIu32, ext_section_size);
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start += ext_section_size;
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= ext_section_size;
}
#if CONFIG_IDF_TARGET_ESP32