Skip to content

Commit 5c43055

Browse files
gerekongerekon
committed
Merge branch 'esp32c61_jtag_doc_update' into 'master'
docs(jtag): update esp32c61 jtag debugging guide Closes IDF-10168 See merge request espressif/esp-idf!33546
2 parents eb606b9 + 6ade64e commit 5c43055

File tree

8 files changed

+23
-30
lines changed

8 files changed

+23
-30
lines changed

‎docs/docs_not_updated/esp32c61.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ api-guides/performance/speed.rst
33
api-guides/performance/size.rst
44
api-guides/performance/ram-usage.rst
55
api-guides/performance/index.rst
6-
api-guides/jtag-debugging/debugging-examples.rst
7-
api-guides/jtag-debugging/configure-ft2232h-jtag.rst
8-
api-guides/jtag-debugging/tips-and-quirks.rst
9-
api-guides/jtag-debugging/using-debugger.rst
10-
api-guides/jtag-debugging/building-openocd-macos.rst
11-
api-guides/jtag-debugging/building-openocd-linux.rst
12-
api-guides/jtag-debugging/configure-other-jtag.rst
13-
api-guides/jtag-debugging/building-openocd-windows.rst
14-
api-guides/jtag-debugging/index.rst
15-
api-guides/jtag-debugging/configure-builtin-jtag.rst
166
api-guides/phy.rst
177
api-guides/app_trace.rst
188
api-guides/low-power-mode.rst

‎docs/en/api-guides/jtag-debugging/configure-other-jtag.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Configure Other JTAG Interfaces
33

44
:link_to_translation:`zh_CN:[中文]`
55

6-
{IDF_TARGET_JTAG_SEL_EFUSE:default="Not Updated!", esp32s3="STRAP_JTAG_SEL", esp32c6="JTAG_SEL_ENABLE", esp32h2="JTAG_SEL_ENABLE", esp32p4="JTAG_SEL_ENABLE", esp32c5="JTAG_SEL_ENABLE"}
6+
{IDF_TARGET_JTAG_SEL_EFUSE:default="Not Updated!", esp32s3="STRAP_JTAG_SEL", esp32c6="JTAG_SEL_ENABLE", esp32h2="JTAG_SEL_ENABLE", esp32p4="JTAG_SEL_ENABLE", esp32c5="JTAG_SEL_ENABLE", esp32c61="JTAG_SEL_ENABLE"}
77

88
For guidance about which JTAG interface to select when using OpenOCD with {IDF_TARGET_NAME}, refer to the section :ref:`jtag-debugging-selecting-jtag-adapter`. Then follow the configuration steps below to get it working.
99

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@
3737
Info : esp_usb_jtag: serial (60:55:F9:F6:03:3C)
3838
Info : esp_usb_jtag: Device found. Base speed 24000KHz, div range 1 to 255
3939
Info : clock speed 24000 kHz
40-
Info : JTAG tap: esp32c61.cpu tap/device found: 0x0000dc25 (mfg: 0x612 (Espressif Systems), part: 0x000d, ver: 0x0)
41-
Info : datacount=2 progbufsize=16
42-
Info : Examined RISC-V core; found 2 harts
43-
Info : hart 0: XLEN=32, misa=0x40903105
44-
Info : starting gdb server for esp32c61 on 3333
40+
Info : JTAG tap: esp32c61.tap0 tap/device found: 0x00014c25 (mfg: 0x612 (Espressif Systems), part: 0x0014, ver: 0x0)
41+
Info : [esp32c61] datacount=1 progbufsize=2
42+
Info : [esp32c61] Examined RISC-V core; found 1 harts
43+
Info : [esp32c61] XLEN=32, misa=0x40101105
44+
Info : [esp32c61] Examination succeed
45+
Info : [esp32c61] starting gdb server on 3333
4546
Info : Listening on port 3333 for gdb connections
4647
4748
.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp32c61-builtin.cfg``
@@ -121,17 +122,17 @@
121122

122123
* - ESP32-C61 Pin
123124
- JTAG Signal
124-
* - MTDO / GPIO7
125+
* - MTDO / GPIO6
125126
- TDO
126-
* - MTDI / GPIO5
127+
* - MTDI / GPIO4
127128
- TDI
128-
* - MTCK / GPIO6
129+
* - MTCK / GPIO5
129130
- TCK
130-
* - MTMS / GPIO4
131+
* - MTMS / GPIO3
131132
- TMS
132133

133-
.. |jtag-sel-gpio| replace:: GPIO15
134-
.. |jtag-gpio-list| replace:: GPIO4-GPIO7
134+
.. |jtag-sel-gpio| replace:: GPIO7
135+
.. |jtag-gpio-list| replace:: GPIO3-GPIO6
135136

136137
---
137138

‎docs/en/api-guides/jtag-debugging/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Open a terminal and set it up for using the ESP-IDF as described in the :ref:`se
180180
:start-after: run-openocd
181181
:end-before: ---
182182

183-
{IDF_TARGET_FTDI_CONFIG:default="Not Updated!", esp32s3="board/esp32s3-ftdi.cfg", esp32c3="board/esp32c3-ftdi.cfg", esp32c6="board/esp32c6-ftdi.cfg", esp32h2="board/esp32h2-ftdi.cfg", esp32p4="board/esp32p4-ftdi.cfg", esp32c5="board/esp32c5-ftdi.cfg"}
183+
{IDF_TARGET_FTDI_CONFIG:default="Not Updated!", esp32s3="board/esp32s3-ftdi.cfg", esp32c3="board/esp32c3-ftdi.cfg", esp32c6="board/esp32c6-ftdi.cfg", esp32h2="board/esp32h2-ftdi.cfg", esp32p4="board/esp32p4-ftdi.cfg", esp32c5="board/esp32c5-ftdi.cfg", esp32c61="board/esp32c61-ftdi.cfg"}
184184

185185
.. note::
186186

‎docs/zh_CN/api-guides/jtag-debugging/configure-other-jtag.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
:link_to_translation:`en:[English]`
55

6-
{IDF_TARGET_JTAG_SEL_EFUSE:default="Not Updated!", esp32s3="STRAP_JTAG_SEL", esp32c6="JTAG_SEL_ENABLE", esp32h2="JTAG_SEL_ENABLE", esp32p4="JTAG_SEL_ENABLE", esp32c5="JTAG_SEL_ENABLE"}
6+
{IDF_TARGET_JTAG_SEL_EFUSE:default="Not Updated!", esp32s3="STRAP_JTAG_SEL", esp32c6="JTAG_SEL_ENABLE", esp32h2="JTAG_SEL_ENABLE", esp32p4="JTAG_SEL_ENABLE", esp32c5="JTAG_SEL_ENABLE", esp32c61="JTAG_SEL_ENABLE"}
77

88
关于适配 OpenOCD 和 {IDF_TARGET_NAME} 的 JTAG 接口选择问题，请参考 :ref:`jtag-debugging-selecting-jtag-adapter` 章节。然后按照以下步骤进行设置，使其正常工作。
99

‎docs/zh_CN/api-guides/jtag-debugging/esp32c61.inc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@
3737
Info : esp_usb_jtag: serial (60:55:F9:F6:03:3C)
3838
Info : esp_usb_jtag: Device found. Base speed 24000KHz, div range 1 to 255
3939
Info : clock speed 24000 kHz
40-
Info : JTAG tap: esp32c61.cpu tap/device found: 0x0000dc25 (mfg: 0x612 (Espressif Systems), part: 0x000d, ver: 0x0)
41-
Info : datacount=2 progbufsize=16
42-
Info : Examined RISC-V core; found 2 harts
43-
Info : hart 0: XLEN=32, misa=0x40903105
44-
Info : starting gdb server for esp32c61 on 3333
40+
Info : JTAG tap: esp32c61.tap0 tap/device found: 0x00014c25 (mfg: 0x612 (Espressif Systems), part: 0x0014, ver: 0x0)
41+
Info : [esp32c61] datacount=1 progbufsize=2
42+
Info : [esp32c61] Examined RISC-V core; found 1 harts
43+
Info : [esp32c61] XLEN=32, misa=0x40101105
44+
Info : [esp32c61] Examination succeed
45+
Info : [esp32c61] starting gdb server on 3333
4546
Info : Listening on port 3333 for gdb connections
4647
4748
.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp32c61-builtin.cfg``

‎docs/zh_CN/api-guides/jtag-debugging/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ OpenOCD 安装完成后就可以配置 {IDF_TARGET_NAME} 目标（即带 JTAG
180180
:start-after: run-openocd
181181
:end-before: ---
182182

183-
{IDF_TARGET_FTDI_CONFIG:default="Not Updated!", esp32s3="board/esp32s3-ftdi.cfg", esp32c3="board/esp32c3-ftdi.cfg", esp32c6="board/esp32c6-ftdi.cfg", esp32h2="board/esp32h2-ftdi.cfg", esp32p4="board/esp32p4-ftdi.cfg", esp32c5="board/esp32c5-ftdi.cfg"}
183+
{IDF_TARGET_FTDI_CONFIG:default="Not Updated!", esp32s3="board/esp32s3-ftdi.cfg", esp32c3="board/esp32c3-ftdi.cfg", esp32c6="board/esp32c6-ftdi.cfg", esp32h2="board/esp32h2-ftdi.cfg", esp32p4="board/esp32p4-ftdi.cfg", esp32c5="board/esp32c5-ftdi.cfg", esp32c61="board/esp32c61-ftdi.cfg"}
184184

185185
.. note::
186186

‎tools/idf_py_actions/constants.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
'esp32c3': '-f board/esp32c3-builtin.cfg',
4444
'esp32s3': '-f board/esp32s3-builtin.cfg',
4545
'esp32c6': '-f board/esp32c6-builtin.cfg',
46+
'esp32c61': '-f board/esp32c61-builtin.cfg',
4647
'esp32c5': '-f board/esp32c5-builtin.cfg',
4748
'esp32h2': '-f board/esp32h2-builtin.cfg',
4849
'esp32p4': '-f board/esp32p4-builtin.cfg',

0 commit comments

Comments
 (0)