Skip to content

Commit 8685219

Browse files
committed
Merge branch 'fix/incorrect_calculation_of_used_xip_pages_v5.3' into 'release/v5.3'
fix(esp_psram): Fix incorrect calculation of used XIP PSRAM pages (v5.3) See merge request espressif/esp-idf!37496
2 parents 611b0f0 + 223b25e commit 8685219

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

components/esp_psram/mmu_psram_flash_v2.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -103,8 +103,7 @@ esp_err_t mmu_config_psram_text_segment(uint32_t start_page, uint32_t psram_size
103103

104104
ESP_EARLY_LOGV(TAG, "after mapping text, starting from paddr=0x%08"PRIx32" and vaddr=0x%08"PRIx32", 0x%"PRIx32" bytes are mapped", MMU_PAGE_TO_BYTES(start_page), irom_load_addr_aligned, mapped_size);
105105

106-
start_page += BYTES_TO_MMU_PAGE(irom_size);
107-
*out_page = start_page;
106+
*out_page = BYTES_TO_MMU_PAGE(irom_size);
108107

109108
return ESP_OK;
110109
}
@@ -138,8 +137,7 @@ esp_err_t mmu_config_psram_rodata_segment(uint32_t start_page, uint32_t psram_si
138137

139138
ESP_EARLY_LOGV(TAG, "after mapping rodata, starting from paddr=0x%08"PRIx32" and vaddr=0x%08"PRIx32", 0x%"PRIx32" bytes are mapped", MMU_PAGE_TO_BYTES(start_page), drom_load_addr_aligned, mapped_size);
140139

141-
start_page += BYTES_TO_MMU_PAGE(drom_size);
142-
*out_page = start_page;
140+
*out_page = BYTES_TO_MMU_PAGE(drom_size);
143141

144142
return ESP_OK;
145143
}

0 commit comments

Comments
 (0)