Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-25 23:08:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_system): update stale SRAM_MAIN_END in esp32p4 ld.hp_mem_defs

Browse Source 
SRAM_MAIN_END is documented as the 2nd stage bootloader iram_loader_seg start address, but
it still holds the value from before 6b417e9d47, which raised
bootloader_iram_loader_seg_len from 0x7000 to 0x8000 and moved that address down by 4 KB.
That commit updated BOOTLOADER_IRAM_LOADER_SEG_START_EXPECTED in bootloader.memory.ld.in
and SRAM_END / SRAM_LOW_END in memory.ld.in, but ld.hp_mem_defs, added two months earlier
by 261bd160aa, was missed:

    rev < 3 : asserted 0x4FF2BBD0, SRAM_MAIN_END 0x4FF2CBD0
    rev >= 3: asserted 0x4FFADFC0, SRAM_MAIN_END 0x4FFAEFC0

0x4FFADFC0 is derived at link time from bootloader_usable_dram_end minus the stack
overhead, dram_seg and iram_loader segments, so it is not an extra reservation - the two
constants are meant to be equal, as the comment above the ASSERT states.

With CONFIG_ULP_COPROC_RUN_FROM_HP_MEM the ULP HP reservation therefore ends 4 KB inside
the bootloader's iram_loader_seg (0x4FFADFC0..0x4FFAEFC0), which that same script declares
off limits for the application, and SRAM_END / SRAM_LOW_END, derived from ULP_HP_MEM_START,
end 4 KB higher than intended. The default build does not reference SRAM_MAIN_END at all.

Also extend the sync comment in bootloader.memory.ld.in to list ld.hp_mem_defs, so the next
change to the segment lengths updates every consumer.

Verified for L2 128 KB and CONFIG_ULP_COPROC_RESERVE_HP_MEM_BYTES=0x10000:

    before: ULP block [0x4FF9EFC0, 0x4FFAEFC0)  -- overlaps iram_loader_seg by 0x1000
    after:  ULP block [0x4FF9DFC0, 0x4FFADFC0)  -- abuts iram_loader_seg exactly

Closes https://github.com/espressif/esp-idf/issues/19133
Merges https://github.com/espressif/esp-idf/pull/19135
This commit is contained in:
kxt116
2026-10-09 12:24:02 +05:30
committed by Meet Patel
parent 99b47ce9fb
commit 015fc10486
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bootloader/subproject/main/ld/esp32p4/bootloader.memory.ld.in
+1
View File
@@ -52,6 +52,7 @@ MEMORY
* 1. Check what the new value of bootloader_iram_loader_seg start is.
* 2. Update the value in this assert.
* 3. Update SRAM_DRAM_END in components/esp_system/ld/esp32p4/memory.ld.in to the same value.
* 4. Update SRAM_MAIN_END in components/esp_system/ld/esp32p4/ld.hp_mem_defs to the same value.
*/
#if !CONFIG_ESP32P4_SELECTS_REV_LESS_V3
#define BOOTLOADER_IRAM_LOADER_SEG_START_EXPECTED 0x4FFADFC0
components/esp_system/ld/esp32p4/ld.hp_mem_defs
+2 -2
View File
@@ -7,9 +7,9 @@
/* ESP32-P4 target-specific HP memory definitions shared between HP app and LP Core linker scripts */
#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
#define SRAM_MAIN_END 0x4FF2CBD0 /* 2nd stage bootloader iram_loader_seg start address (rev < 3) */
#define SRAM_MAIN_END 0x4FF2BBD0 /* 2nd stage bootloader iram_loader_seg start address (rev < 3) */
#else
#define SRAM_MAIN_END 0x4FFAEFC0 /* 2nd stage bootloader iram_loader_seg start address (rev3+) */
#define SRAM_MAIN_END 0x4FFADFC0 /* 2nd stage bootloader iram_loader_seg start address (rev3+) */
#endif
#if CONFIG_ULP_COPROC_RUN_FROM_HP_MEM