blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 09:09:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20250226' into 'master'

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

See merge request espressif/esp-idf!37462
This commit is contained in:
Erhan Kurubas 2025-03-05 22:24:35 +08:00
commit feb9d8c157
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/security/hmac_soft_jtag/pytest_jtag_example.py
View File

@ -11,16 +11,18 @@ from pytest_embedded_idf import IdfDut
from pytest_embedded_idf.utils import idf_parametrize
def run_gdb_test(dut: IdfDut) -> None:
def run_gdb_test(dut: IdfDut) -> str:
with open(os.path.join(dut.logdir, 'ocd.txt'), 'w', encoding='utf-8') as ocd_log, pexpect.spawn(
f'openocd -f board/esp32c6-builtin.cfg', timeout=60, logfile=ocd_log, encoding='utf-8', codec_errors='ignore'
) as p:
try:
p.expect(re.compile(r'JTAG tap: esp32c6.cpu tap/device found'), timeout=5)
p.expect(re.compile(r'JTAG tap: esp32c6.tap0 tap/device found'), timeout=5)
logging.info('JTAG is enabled.')
return 'enabled'
except pexpect.TIMEOUT:
except pexpect.ExceptionPexpect:
logging.info('JTAG is disabled')
return 'disabled'
finally:
p.terminate()
@ -33,16 +35,16 @@ def test_jtag_re_enable(dut: IdfDut) -> None:
dut.expect_exact('esp32c6>', timeout=30)
logging.info('Initially:')
run_gdb_test(dut)
assert run_gdb_test(dut) == 'disabled'
logging.info('After calling enable_jtag:')
# The following token data is generated using the HMAC key:
# {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}
dut.write('enable_jtag b2a49b1cce1be922bb7e431277413e3e8e6c3e8e6e17625c50ac66a9a857949b')
dut.expect('JTAG re-enablement workflow performed', timeout=30)
run_gdb_test(dut)
assert run_gdb_test(dut) == 'enabled'
logging.info('After calling disable_jtag:')
dut.write('disable_jtag')
dut.expect('JTAG disabled temporarily', timeout=30)
run_gdb_test(dut)
assert run_gdb_test(dut) == 'disabled'

50
tools/tools.json
View File

@ -611,46 +611,46 @@
"versions": [
{
"linux-amd64": {
"sha256": "e82b0f036dc99244bead5f09a86e91bb2365cbcd1122ac68261e5647942485df",
"size": 2398717,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-amd64-0.12.0-esp32-20241016.tar.gz"
"sha256": "914c726342ba5828e53f41aa454f01f317c42d8e6772d3d874593a6960fc4729",
"size": 2414924,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-amd64-0.12.0-esp32-20250226.tar.gz"
},
"linux-arm64": {
"sha256": "8f8daf5bd22ec5d2fa9257b0862ec33da18ee677e023fb9a9eb17f74ce208c76",
"size": 2271584,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-arm64-0.12.0-esp32-20241016.tar.gz"
"sha256": "c44ee99a9209c0234dbbcec86339fd685f5c61a763b29c33eba590bf62db2296",
"size": 2293923,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-arm64-0.12.0-esp32-20250226.tar.gz"
},
"linux-armel": {
"sha256": "bc9c020ecf20e2000f76cffa44305fd5bc44d2e688ea78cce423399d33f19767",
"size": 2414206,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-armel-0.12.0-esp32-20241016.tar.gz"
"sha256": "21ab6af3cf05f9290f4d59f1f381d5094dd2755fc528d3d2feb9334348fc0d8d",
"size": 2436071,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-armel-0.12.0-esp32-20250226.tar.gz"
},
"linux-armhf": {
"sha256": "2cd6436465333e998000b1c311d301b295d8ebaa3fb1c9aa9d4393539dc16ec6",
"size": 2258623,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-armhf-0.12.0-esp32-20241016.tar.gz"
"sha256": "868569f0ba089e45cd4c7889bc4ea1a5bb17a574da6c01227e657ba0d4aa9e0e",
"size": 2279612,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-armhf-0.12.0-esp32-20250226.tar.gz"
},
"macos": {
"sha256": "02a2dffe801a2d005fa9e614d80ff8173395b2cb0b5d3118d0229d094a9946a7",
"size": 2508089,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-macos-0.12.0-esp32-20241016.tar.gz"
"sha256": "0b5751699e93b6d101381611c96216ddff8c7dfd16425c610993fa27993f9a0a",
"size": 2525387,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-0.12.0-esp32-20250226.tar.gz"
},
"macos-arm64": {
"sha256": "c382f9e884d6565cb6089bff5f200f4810994667d885f062c3d3c5625a0fa9d6",
"size": 2552569,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-macos-arm64-0.12.0-esp32-20241016.tar.gz"
"sha256": "8bffbbb594b27a4971a3922792135f8c836fff26991f7f450094386920263531",
"size": 2568843,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-arm64-0.12.0-esp32-20250226.tar.gz"
},
"name": "v0.12.0-esp32-20241016",
"name": "v0.12.0-esp32-20250226",
"status": "recommended",
"win32": {
"sha256": "3b5d615e0a72cc771a45dd469031312d5881c01d7b6bc9edb29b8b6bda8c2e90",
"size": 2946244,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-win32-0.12.0-esp32-20241016.zip"
"sha256": "aaf3c955bb4eb47805a1ba108dfd07a8a56ce720cb40194a354362b5f0961230",
"size": 2960226,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win32-0.12.0-esp32-20250226.zip"
},
"win64": {
"sha256": "5e7b2fd1947d3a8625f6a11db7a2340cf2f41ff4c61284c022c7d7c32b18780a",
"size": 2946244,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-win64-0.12.0-esp32-20241016.zip"
"sha256": "79baf35325117a53093b62f6b9bee677dd12275d7066e3f8a274d2a80e986b6e",
"size": 2960225,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win64-0.12.0-esp32-20250226.zip"
}
}
]