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

Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260831_v5.4' into 'release/v5.4'

Browse Source 
feat(tools): update openocd version to v0.12.0-esp32-20260831 (v5.4)

See merge request espressif/esp-idf!52394
This commit is contained in:
Alexey Gerenkov
2026-09-04 20:23:42 +08:00
parent 80b1f8b428 29b7fb858f
commit 62c1a66eba
8 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_system/Kconfig
+2 -2
View File
@@ -535,7 +535,7 @@ menu "ESP System Settings"
which does some useful debugging stuff, e.g. GCOV data dump.
config ESP_DEBUG_INCLUDE_OCD_STUB_BINS
bool "Preload OpenOCD stub binaries to speed up debugging. 8K memory will be reserved"
bool "Preload OpenOCD stub binaries to speed up debugging. 12K memory will be reserved"
default n
depends on SOC_DEBUG_HAVE_OCD_STUB_BINS
help
@@ -544,7 +544,7 @@ menu "ESP System Settings"
To execute stub code, OpenOCD allocates memory on the target device, backs up the existing memory,
loads the stub binary, runs the binary, and then restores the original memory.
This process can be time-consuming, especially when using USB serial JTAG.
By enabling this option, 8K of memory in RAM will be preallocated with the stub code,
By enabling this option, 12K of memory in RAM will be preallocated with the stub code,
eliminating the need to back up and restore the memory region.
config ESP_DEBUG_OCDAWARE
components/esp_system/ld/esp32c6/sections.ld.in
+2 -2
View File
@@ -170,14 +170,14 @@ SECTIONS
/* Do not move this block! OpenOCD expects this to be at the beginning of IRAM. */
KEEP(*(.ocd_stub.code));
KEEP(*(.ocd_stub.tramp));
. = ALIGN(0x800);
. = ALIGN(0x1000);
KEEP(*(.ocd_stub.data));
KEEP(*(.ocd_stub.bss));
KEEP(*(.ocd_stub.stack));
KEEP(*(.ocd_stub.params));
. = ALIGN(0x1000);
KEEP(*(.ocd_stub.scratchmem));
ASSERT(ABSOLUTE(.) == _iram_start + 0x2000, "openocd stub memory must be ended at _iram_start + 0x2000");
ASSERT(ABSOLUTE(.) == _iram_start + 0x3000, "openocd stub memory must be ended at _iram_start + 0x3000");
#endif
/* Vectors go to start of IRAM */
components/esp_system/ld/esp32h2/sections.ld.in
+2 -2
View File
@@ -170,14 +170,14 @@ SECTIONS
/* Do not move this block! OpenOCD expects this to be at the beginning of IRAM. */
KEEP(*(.ocd_stub.code));
KEEP(*(.ocd_stub.tramp));
. = ALIGN(0x800);
. = ALIGN(0x1000);
KEEP(*(.ocd_stub.data));
KEEP(*(.ocd_stub.bss));
KEEP(*(.ocd_stub.stack));
KEEP(*(.ocd_stub.params));
. = ALIGN(0x1000);
KEEP(*(.ocd_stub.scratchmem));
ASSERT(ABSOLUTE(.) == _iram_start + 0x2000, "openocd stub memory must be ended at _iram_start + 0x2000");
ASSERT(ABSOLUTE(.) == _iram_start + 0x3000, "openocd stub memory must be ended at _iram_start + 0x3000");
#endif
/* Vectors go to start of IRAM */