Skip to content

Commit 5852e11

Browse files
committed
generalizing tool paths.
1 parent 0ca159b commit 5852e11

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

sparkfun/samd/platform.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ compiler.warning_flags.more=-Wall
3232
compiler.warning_flags.all=-Wall -Wextra
3333

3434
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
35-
#compiler.path={runtime.tools.arm-none-eabi-gcc-4.8.3-2014q1.path}/bin/
3635
compiler.c.cmd=arm-none-eabi-gcc
3736
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
3837
compiler.c.elf.cmd=arm-none-eabi-gcc
@@ -149,7 +148,8 @@ tools.bossac.upload.network_pattern="{network_cmd}" -address {serial.port} -port
149148
# OpenOCD sketch upload
150149
#
151150

152-
tools.openocd.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
151+
#tools.openocd.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
152+
#tools.openocd.path={runtime.tools.openocd}
153153
tools.openocd.cmd=bin/openocd
154154
tools.openocd.cmd.windows=bin/openocd.exe
155155

@@ -178,7 +178,8 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/
178178
# FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences
179179
#
180180

181-
tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
181+
#tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
182+
tools.openocd-withbootsize.path={runtime.tools.openocd}
182183
tools.openocd-withbootsize.cmd=bin/openocd
183184
tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
184185

0 commit comments

Comments
 (0)