Skip to content

Commit c9e285c

Browse files
committed
fix ci, rename script
1 parent 41cd7a7 commit c9e285c

File tree

7 files changed

+63
-38
lines changed

7 files changed

+63
-38
lines changed

.github/workflows/githubci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
arduino-cli lib install "Adafruit NeoPixel" "Adafruit seesaw Library" "Adafruit SPIFlash" "FlashStorage" "MIDI Library" "SD" "SdFat - Adafruit Fork"
6363
6464
- name: Build examples
65-
run: python3 extras/build_all.py ${{ matrix.board }}
65+
run: python3 tools/build_all.py ${{ matrix.board }}

boards.txt

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

platform.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ debug.toolchain.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
234234
debug.toolchain.prefix=arm-none-eabi-
235235
debug.server=openocd
236236
debug.server.openocd.path={runtime.tools.openocd.path}/bin/openocd
237-
#debug.server.openocd.path=/usr/local/bin/openocd
238237
debug.server.openocd.scripts_dir={runtime.tools.openocd.path}/share/openocd/scripts/
239238
debug.server.openocd.script={runtime.platform.path}/{build.openocdscript}
240239

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ transport select swd
2626
set CHIPNAME samd51
2727

2828
source [find target/atsame5x.cfg]
29-
adapter speed 500

scripts/openocd/same5x.cfg

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Arduino Zero OpenOCD script.
3+
#
4+
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
5+
#
6+
# This library is free software; you can redistribute it and/or
7+
# modify it under the terms of the GNU Lesser General Public
8+
# License as published by the Free Software Foundation; either
9+
# version 2.1 of the License, or (at your option) any later version.
10+
#
11+
# This library is distributed in the hope that it will be useful,
12+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14+
# See the GNU Lesser General Public License for more details.
15+
#
16+
# You should have received a copy of the GNU Lesser General Public
17+
# License along with this library; if not, write to the Free Software
18+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
#
20+
21+
source [find interface/cmsis-dap.cfg]
22+
transport select swd
23+
24+
# chip name
25+
set CHIPNAME same51
26+
27+
source [find target/atsame5x.cfg]

tools/makeboards.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'build_mcu': 'cortex-m0plus',
2626
'f_cpu': '48000000L',
2727
'extra_flags': '-DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS',
28-
'openocdscript': 'debug/openocd/samd21.cfg',
28+
'openocdscript': 'scripts/openocd/samd2x.cfg',
2929
},
3030

3131
'SAMD51': {
@@ -35,7 +35,7 @@
3535
'build_mcu': 'cortex-m4',
3636
'f_cpu': '120000000L',
3737
'extra_flags': '-D__SAMD51__ -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16',
38-
'openocdscript': 'debug/openocd/samd51.cfg',
38+
'openocdscript': 'scripts/openocd/samd5x.cfg',
3939
},
4040

4141
'SAME51': {
@@ -45,7 +45,7 @@
4545
'build_mcu': 'cortex-m4',
4646
'f_cpu': '120000000L',
4747
'extra_flags': '-D__SAMD51__ -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16',
48-
'openocdscript': 'debug/openocd/same51.cfg',
48+
'openocdscript': 'scripts/openocd/same5x.cfg',
4949
},
5050
}
5151

0 commit comments

Comments
 (0)