riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openocd: Allow using OpenOCD-shipped configs

Browse Source 
OpenOCD already ships config files for the EFM32 and EFR32 family, no
need to duplicate them in RIOT; this removes the "file exists" check for
files that are clearly OpenOCD-shipped board configurations, as the
script can't (and shouldn't) know OpenOCD's include paths.
This commit is contained in:
chrysn 2020-02-14 09:24:25 +01:00
parent 4387739494
commit ac8ed1eb13
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/tools/openocd/openocd.sh vendored
View File

@ -4,7 +4,8 @@
# #
# This script is supposed to be called from RIOTs make system, # This script is supposed to be called from RIOTs make system,
# as it depends on certain environment variables. An OpenOCD # as it depends on certain environment variables. An OpenOCD
# configuration file must be present in a the boards dist folder. # configuration file must be present in a the boards dist folder
# or be given as "board/[...].cfg" to use an OpenOCD shipped configuration.
# #
# Any extra command line arguments after the command name are passed on the # Any extra command line arguments after the command name are passed on the
# openocd command line after the configuration file name but before any other # openocd command line after the configuration file name but before any other
@ -133,7 +134,7 @@ fi
# a couple of tests for certain configuration options # a couple of tests for certain configuration options
# #
test_config() { test_config() {
if [ ! -f "${OPENOCD_CONFIG}" ]; then if [ ! -f "${OPENOCD_CONFIG}" ] && [[ ! "${OPENOCD_CONFIG}" == board/* ]] ; then
echo "Error: Unable to locate OpenOCD configuration file" echo "Error: Unable to locate OpenOCD configuration file"
echo " (${OPENOCD_CONFIG})" echo " (${OPENOCD_CONFIG})"
exit 1 exit 1