Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260831_v6.0' into 'release/v6.0'

feat(tools): update openocd version to v0.12.0-esp32-20260831 (v6.0)

See merge request espressif/esp-idf!52392
This commit is contained in:
Alexey Gerenkov
2026-09-04 17:32:14 +08:00
22 changed files with 101 additions and 40 deletions
@@ -32,7 +32,12 @@
* should be stored via esp_app_tee_config structure
*/
#if CONFIG_ESP_DEBUG_INCLUDE_OCD_STUB_BINS
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x32b0 );
#else
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x2b0 );
#endif
PROVIDE ( GDMA = 0x60080000 );
/* SPI Flash functions required from the ROM (refer esp32c5.rom.spiflash.ld) */
@@ -33,7 +33,7 @@
*/
#if CONFIG_ESP_DEBUG_INCLUDE_OCD_STUB_BINS
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x22e0 );
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x32e0 );
#else
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x2e0 );
#endif
@@ -32,7 +32,12 @@
* should be stored via esp_app_tee_config structure
*/
#if CONFIG_ESP_DEBUG_INCLUDE_OCD_STUB_BINS
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x32b0 );
#else
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x2b0 );
#endif
PROVIDE ( GDMA = 0x60080000 );
/* SPI Flash functions required from the ROM (refer esp32c61.rom.spiflash.ld) */
@@ -33,7 +33,7 @@
*/
#if CONFIG_ESP_DEBUG_INCLUDE_OCD_STUB_BINS
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x22e0 );
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x32e0 );
#else
PROVIDE ( esp_tee_app_config = SRAM_REE_SEG_START + 0x2e0 );
#endif