From 9a36170cea817f7da4326add2e7daa1e9d17c85a Mon Sep 17 00:00:00 2001 From: sh-sergey <26677086+sh-sergey@users.noreply.github.com> Date: Fri, 14 Mar 2025 18:33:59 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=B0=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=BE=D0=BC=20--openocd-port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mik32_upload.py | 5 +++++ 1 file changed, 5 insertions(+) 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: From 92a2b7be184299926b8e24130020de2127d539a9 Mon Sep 17 00:00:00 2001 From: sh-sergey <26677086+sh-sergey@users.noreply.github.com> Date: Fri, 14 Mar 2025 18:35:31 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 770bc01..e1df448 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ ### Удалено +## [v0.3.3] - 2025-03-14 + +### Исправлено +- Ошибка записи eeprom при boot=1 (ram) +- Выбор порта аргументом --openocd-port + ## [v0.3.2] - 2024-12-28 ### Добавлено From 9f13695d6b3f9678f4b611bafebd64c08884c8c2 Mon Sep 17 00:00:00 2001 From: sh-sergey <26677086+sh-sergey@users.noreply.github.com> Date: Fri, 14 Mar 2025 18:40:30 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From 7a02683c4d18dfa0441e1a7f2331c160a8fad491 Mon Sep 17 00:00:00 2001 From: cryptozoy <48826370+cryptozoy@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:21:55 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20mik32.cfg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) Сокращение вывода бесполезных предупреждений; 2) Добавление нестандартного CSR-регистра MCOUNTEN, используемого для управления активностью счётчиков производительности (тактов и команд). --- openocd-scripts/target/mik32.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openocd-scripts/target/mik32.cfg b/openocd-scripts/target/mik32.cfg index e3de59e..de109cd 100644 --- a/openocd-scripts/target/mik32.cfg +++ b/openocd-scripts/target/mik32.cfg @@ -8,15 +8,18 @@ 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 + riscv.cpu configure -event reset-init my_init_proc } From 044abedcc99a043070b8c4ac84998d466129d75e Mon Sep 17 00:00:00 2001 From: sh-sergey <26677086+sh-sergey@users.noreply.github.com> Date: Mon, 17 Mar 2025 11:39:21 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9,=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=B2=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4?= =?UTF-8?q?=D0=B6=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .piopm | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 e1df448..8a2e229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,9 +22,10 @@ ### Удалено -## [v0.3.3] - 2025-03-14 +## [v0.3.3] - 2025-03-17 ### Исправлено +- Добавлен id для TCB блока МК, Добавление нестандартного CSR-регистра MCOUNTEN (@cryptozoy) - Ошибка записи eeprom при boot=1 (ram) - Выбор порта аргументом --openocd-port From edd479f9532c177c1526b8dca1e8d0942542cf17 Mon Sep 17 00:00:00 2001 From: sh-sergey <26677086+sh-sergey@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:59:17 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=B2=20?= =?UTF-8?q?package.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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",