diff --git a/.piopm b/.piopm index e817be5..153bfd1 100644 --- a/.piopm +++ b/.piopm @@ -1 +1 @@ -{"type": "tool", "name": "tool-mik32-uploader", "version": "0.3.2", "spec": {"owner": "mikron", "id": 122, "name": "tool-mik32-uploader", "requirements": null, "uri": null}} \ No newline at end of file +{"type": "tool", "name": "tool-mik32-uploader", "version": "0.3.3", "spec": {"owner": "mikron", "id": 122, "name": "tool-mik32-uploader", "requirements": null, "uri": null}} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 770bc01..8a2e229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,13 @@ ### Удалено +## [v0.3.3] - 2025-03-17 + +### Исправлено +- Добавлен id для TCB блока МК, Добавление нестандартного CSR-регистра MCOUNTEN (@cryptozoy) +- Ошибка записи eeprom при boot=1 (ram) +- Выбор порта аргументом --openocd-port + ## [v0.3.2] - 2024-12-28 ### Добавлено diff --git a/_version.py b/_version.py index 52f3b6a..1b40dc2 100644 --- a/_version.py +++ b/_version.py @@ -1 +1 @@ -applicaton_version = 'v0.3.2' +applicaton_version = 'v0.3.3' diff --git a/mik32_upload.py b/mik32_upload.py index c4c1115..86b3040 100644 --- a/mik32_upload.py +++ b/mik32_upload.py @@ -225,6 +225,11 @@ def upload_file( segments: List[Segment] = file.get_segments() pages: Pages = form_pages(segments, boot_mode) + try: + port = int(port) + except ValueError: + print("An integer argument --openocd-port was expected!") + proc: Union[subprocess.Popen, None] = None if is_run_openocd: try: diff --git a/openocd-scripts/target/mik32.cfg b/openocd-scripts/target/mik32.cfg index 3fded9f..0227d3f 100644 --- a/openocd-scripts/target/mik32.cfg +++ b/openocd-scripts/target/mik32.cfg @@ -54,14 +54,17 @@ proc init_targets {} { set _CHIPNAME riscv set _CPUTAPID 0xdeb11001 + set _SYSTAPID 0xfffffffe jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID - jtag newtap $_CHIPNAME sys -irlen 4 -ircapture 0x05 -irmask 0x0F -enable + jtag newtap $_CHIPNAME sys -irlen 4 -ircapture 0x05 -irmask 0x0F -enable -expected-id $_SYSTAPID -ignore-bypass set _TARGETNAME $_CHIPNAME.cpu target create $_TARGETNAME riscv -endian little -chain-position $_TARGETNAME -coreid 0 + + riscv expose_csrs 2016=mcounten } poll_period 200 diff --git a/package.json b/package.json index acdbb19..8ce2e5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tool-mik32-uploader", - "version": "0.3.2", + "version": "0.3.3", "description": "mik32-uploader", "keywords": [ "tools",