Skip to content

Commit ac9e81e

Browse files
authored
Merge pull request adafruit#358 from rcross-lc/master
Use the correct openocd flash driver for ATSAMD51 devices
2 parents 72e88b4 + 634b97c commit ac9e81e

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

platform.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ tools.openocd.erase.pattern=
195195

196196
tools.openocd.bootloader.params.verbose=-d2
197197
tools.openocd.bootloader.params.quiet=-d0
198-
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
198+
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; $_FLASHDRIVER bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
199199

200200
#
201201
# OpenOCD sketch upload - version with configurable bootloader size
@@ -221,7 +221,7 @@ tools.openocd-withbootsize.erase.pattern=
221221

222222
tools.openocd-withbootsize.bootloader.params.verbose=-d2
223223
tools.openocd-withbootsize.bootloader.params.quiet=-d0
224-
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
224+
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; $_FLASHDRIVER bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
225225

226226
# ----------------------------------------
227227
# Debugger configuration (general options)

scripts/openocd/daplink_samd21.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ transport select swd
2424
# chip name
2525
set CHIPNAME samd21
2626

27+
set _FLASHDRIVER at91samd
28+
2729
source [find target/at91samdXX.cfg]

scripts/openocd/daplink_samd51.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ transport select swd
2424
# chip name
2525
set CHIPNAME samd51
2626

27+
set _FLASHDRIVER atsame5
28+
2729
source [find target/atsame5x.cfg]

scripts/openocd/jlink_samd21.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ transport select swd
2424
# chip name
2525
set CHIPNAME samd21
2626

27+
set _FLASHDRIVER at91samd
28+
2729
source [find target/at91samdXX.cfg]

scripts/openocd/jlink_samd51.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ transport select swd
2424
# chip name
2525
set CHIPNAME samd51
2626

27+
set _FLASHDRIVER atsame5
28+
2729
source [find target/atsame5x.cfg]

0 commit comments

Comments
 (0)