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

Merge pull request #10478 from gebart/frdm/openocd-default-new

Browse Source 
frdm: Use configuration for OpenOCD 0.10.0 or newer by default
This commit is contained in:
Alexandre Abadie 2018-11-29 15:05:50 +01:00 committed by GitHub
commit a7fa9e5580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/common/frdm/Makefile.include
View File

@ -8,10 +8,10 @@ export DEBUG_ADAPTER ?= dap
#export DEBUG_ADAPTER ?= jlink #export DEBUG_ADAPTER ?= jlink
# OpenOCD v0.10.0 and newer have built-in support for disabling the Kinetis # OpenOCD v0.10.0 and newer have built-in support for disabling the Kinetis
# watchdog automatically. However, current stable releases of Ubuntu and Debian # watchdog automatically. Some older releases of Ubuntu and Debian have only
# have only version 0.9.0 and older OpenOCD packages (Ubuntu 17.04, Debian Jessie) # version 0.9.0 or earlier OpenOCD packages (Ubuntu 17.04, Debian Jessie)
# Set this to 0 to avoid the extra manual step of disabling the watchdog. # Set this to 1 if you are using one of these older releases.
export USE_OLD_OPENOCD ?= 1 USE_OLD_OPENOCD ?= 0
ifeq (1,$(USE_OLD_OPENOCD)) ifeq (1,$(USE_OLD_OPENOCD))
# We need special handling of the watchdog if we want to speed up the flash # We need special handling of the watchdog if we want to speed up the flash

4
boards/frdm-kw41z/Makefile.include
View File

@ -2,10 +2,6 @@
export CPU = kinetis export CPU = kinetis
export CPU_MODEL = mkw41z512vht4 export CPU_MODEL = mkw41z512vht4
# OpenOCD v0.10.0-dev (current development version) or later is required for
# flashing KW41Z devices
# See http://openocd.zylin.com/#/c/4104/ for the upstreaming process
export USE_OLD_OPENOCD ?= 0
# This board comes with OpenSDA configured for JLink compatibility # This board comes with OpenSDA configured for JLink compatibility
export DEBUG_ADAPTER ?= jlink export DEBUG_ADAPTER ?= jlink