Skip to content

Commit 52e8876

Browse files
committed
Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20250707' into 'master'
feat(tools): update openocd version to v0.12.0-esp32-20250707 See merge request espressif/esp-idf!40396
2 parents dffb03f + 168d95d commit 52e8876

38 files changed

+18761
-16286
lines changed

components/app_trace/sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* SPDX-License-Identifier: BSD-1-Clause
55
*
6-
* SPDX-FileContributor: 2017-2024 Espressif Systems (Shanghai) CO LTD
6+
* SPDX-FileContributor: 2017-2025 Espressif Systems (Shanghai) CO LTD
77
*/
88
/*********************************************************************
99
* SEGGER Microcontroller GmbH *
@@ -84,11 +84,7 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
8484
// The target device name
8585
#define SYSVIEW_DEVICE_NAME CONFIG_IDF_TARGET
8686
// The target core name
87-
#if CONFIG_IDF_TARGET_ARCH_XTENSA
88-
#define SYSVIEW_CORE_NAME "xtensa"
89-
#elif CONFIG_IDF_TARGET_ARCH_RISCV
90-
#define SYSVIEW_CORE_NAME "riscv"
91-
#endif
87+
#define SYSVIEW_CORE_NAME "core0" // In dual core, this will be renamed by OpenOCD as core1
9288

9389
// Determine which timer to use as timestamp source
9490
#if CONFIG_APPTRACE_SV_TS_SOURCE_CCOUNT

docs/en/api-guides/jtag-debugging/esp32.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
- ESP32 target configuration file. Can be used together with one of the ``interface/`` configuration files.
9898
* - ``target/esp32-solo-1.cfg``
9999
- Target configuration file for ESP32-SOLO-1 module. Different from ``esp32.cfg`` in that it only configures one CPU.
100-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
100+
* - ``interface/ftdi/esp_ftdi.cfg``
101101
- JTAG adapter configuration file for ESP-WROVER-KIT and ESP-Prog boards.
102102

103103
---

docs/en/api-guides/jtag-debugging/esp32c2.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
- Board configuration file for ESP32-C2 debug through an ESP-Prog compatible FTDI, includes target and adapter configuration.
9595
* - ``target/esp32c2.cfg``
9696
- ESP32-C2 target configuration file. Can be used together with one of the ``interface/`` configuration files.
97-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
97+
* - ``interface/ftdi/esp_ftdi.cfg``
9898
- JTAG adapter configuration file for ESP-Prog boards.
9999

100100
---

docs/en/api-guides/jtag-debugging/esp32c3.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
- ESP32-C3 target configuration file. Can be used together with one of the ``interface/`` configuration files.
9898
* - ``interface/esp_usb_jtag.cfg``
9999
- JTAG adapter configuration file for ESP32-C3.
100-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
100+
* - ``interface/ftdi/esp_ftdi.cfg``
101101
- JTAG adapter configuration file for ESP-Prog boards.
102102

103103
---

docs/en/api-guides/jtag-debugging/esp32c5.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
- ESP32-C5 target configuration file. Can be used together with one of the ``interface/`` configuration files.
104104
* - ``interface/esp_usb_jtag.cfg``
105105
- JTAG adapter configuration file for ESP32-C5.
106-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
106+
* - ``interface/ftdi/esp_ftdi.cfg``
107107
- JTAG adapter configuration file for ESP-Prog boards.
108108

109109
---

docs/en/api-guides/jtag-debugging/esp32c6.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
- ESP32-C6 target configuration file. Can be used together with one of the ``interface/`` configuration files.
103103
* - ``interface/esp_usb_jtag.cfg``
104104
- JTAG adapter configuration file for ESP32-C6.
105-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
105+
* - ``interface/ftdi/esp_ftdi.cfg``
106106
- JTAG adapter configuration file for ESP-Prog boards.
107107

108108
---

docs/en/api-guides/jtag-debugging/esp32c61.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
- ESP32-C61 target configuration file. Can be used together with one of the ``interface/`` configuration files.
104104
* - ``interface/esp_usb_jtag.cfg``
105105
- JTAG adapter configuration file for ESP32-C61.
106-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
106+
* - ``interface/ftdi/esp_ftdi.cfg``
107107
- JTAG adapter configuration file for ESP-Prog boards.
108108

109109
---

docs/en/api-guides/jtag-debugging/esp32h2.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
- ESP32-H2 target configuration file. Can be used together with one of the ``interface/`` configuration files.
101101
* - ``interface/esp_usb_jtag.cfg``
102102
- JTAG adapter configuration file for ESP32-H2.
103-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
103+
* - ``interface/ftdi/esp_ftdi.cfg``
104104
- JTAG adapter configuration file for ESP-Prog boards.
105105

106106
---

docs/en/api-guides/jtag-debugging/esp32h21.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
- ESP32-H2 target configuration file. Can be used together with one of the ``interface/`` configuration files.
101101
* - ``interface/esp_usb_jtag.cfg``
102102
- JTAG adapter configuration file for ESP32-H2.
103-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
103+
* - ``interface/ftdi/esp_ftdi.cfg``
104104
- JTAG adapter configuration file for ESP-Prog boards.
105105

106106
---

docs/en/api-guides/jtag-debugging/esp32h4.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
- ESP32-H2 target configuration file. Can be used together with one of the ``interface/`` configuration files.
101101
* - ``interface/esp_usb_jtag.cfg``
102102
- JTAG adapter configuration file for ESP32-H2.
103-
* - ``interface/ftdi/esp32_devkitj_v1.cfg``
103+
* - ``interface/ftdi/esp_ftdi.cfg``
104104
- JTAG adapter configuration file for ESP-Prog boards.
105105

106106
---

0 commit comments

Comments
 (0)