Skip to content

Commit 108fa4e

Browse files
committed
nicla sense: allow uploading with openocd
pyocd is not packaged in our default tools so I've changed the commands in order to use openocd
1 parent 61293ec commit 108fa4e

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

boards.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,11 @@ niclasense.pid.0=0x0360
371371
niclasense.upload_port.0.vid=0x2341
372372
niclasense.upload_port.0.pid=0x0060
373373

374-
#niclasense.upload.tool=openocd
375-
#niclasense.upload.tool.default=openocd
376-
niclasense.upload.tool=pyocd
377-
niclasense.upload.tool.default=pyocd
374+
niclasense.upload.tool=openocd
375+
niclasense.upload.tool.default=openocd
378376
niclasense.upload.protocol=
379-
niclasense.upload.transport=
377+
niclasense.upload.config=-f target/nrf52.cfg
378+
niclasense.upload.programmer=-f interface/cmsis-dap.cfg
380379
niclasense.upload.vid=0x2341
381380
niclasense.upload.pid=0x0060
382381
niclasense.upload.interface=0
@@ -391,10 +390,8 @@ niclasense.upload.target=nrf52
391390
niclasense.upload.maximum_size=786432
392391
niclasense.upload.maximum_data_size=523624
393392

394-
#niclasense.bootloader.tool=openocd
395-
#niclasense.bootloader.tool.default=openocd
396-
niclasense.bootloader.tool=pyocd
397-
niclasense.bootloader.tool.default=pyocd
393+
niclasense.bootloader.tool=openocd
394+
niclasense.bootloader.tool.default=openocd
398395
niclasense.bootloader.vid=0x2341
399396
niclasense.bootloader.pid=0x0360
400397
niclasense.bootloader.interface=0

platform.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,19 @@ tools.openocd.cmd.windows=bin/openocd.exe
167167

168168
tools.openocd.upload.params.verbose=-d2
169169
tools.openocd.upload.params.quiet=-d0
170-
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{build.path}/{build.project_name}.elf}; reset run; shutdown"
170+
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; flash write_image erase {{build.path}/{build.project_name}.{upload.extension}} {upload.address} bin; reset run; shutdown"
171171

172172
tools.openocd.program.params.verbose=-d2
173173
tools.openocd.program.params.quiet=-d0
174-
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{build.path}/{build.project_name}.elf}; reset run; shutdown"
174+
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; flash write_image erase {{build.path}/{build.project_name}.{upload.extension}} {upload.address} bin; reset run; shutdown"
175175

176176
tools.openocd.erase.params.verbose=-d2
177177
tools.openocd.erase.params.quiet=-d0
178178
tools.openocd.erase.pattern=
179179

180180
tools.openocd.bootloader.params.verbose=-d2
181181
tools.openocd.bootloader.params.quiet=-d0
182-
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; {bootloader.extra_action.preflash}; program {{runtime.platform.path}/bootloaders/{bootloader.file}}; reset run; shutdown"
182+
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{runtime.platform.path}/firmwares/{bootloader.file}}; reset run; shutdown"
183183

184184
#
185185
# BOSSA

programmers.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cmsis-dap.name=ARM CMSIS-DAP compatible
22
cmsis-dap.communication=USB
33
cmsis-dap.protocol=
44
cmsis-dap.program.protocol=
5-
cmsis-dap.program.tool=pyocd
6-
cmsis-dap.program.tool.default=pyocd
5+
cmsis-dap.program.tool=openocd
6+
cmsis-dap.program.tool.default=openocd
77
cmsis-dap.program.extra_params=
88
cmsis-dap.programmer.protocol=cmsis-dap
99

0 commit comments

Comments
 (0)