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

boards: don't export globally OPENOCD_CONFIG

Browse Source 
The variable is already exported to required target in openocd.inc.mk
This commit is contained in:
Alexandre Abadie 2020-02-22 11:33:19 +01:00
parent bd081cd980
commit 9363f077d6
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/blackpill-128kib/Makefile.include
View File

@ -1,3 +1,3 @@
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg
include $(RIOTBOARD)/common/blxxxpill/Makefile.include include $(RIOTBOARD)/common/blxxxpill/Makefile.include

2
boards/blackpill/Makefile.include
View File

@ -1,3 +1,3 @@
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg
include $(RIOTBOARD)/common/blxxxpill/Makefile.include include $(RIOTBOARD)/common/blxxxpill/Makefile.include

2
boards/bluepill-128kib/Makefile.include
View File

@ -1,3 +1,3 @@
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg
include $(RIOTBOARD)/common/blxxxpill/Makefile.include include $(RIOTBOARD)/common/blxxxpill/Makefile.include

2
boards/bluepill/Makefile.include
View File

@ -1,3 +1,3 @@
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg
include $(RIOTBOARD)/common/blxxxpill/Makefile.include include $(RIOTBOARD)/common/blxxxpill/Makefile.include

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

@ -11,7 +11,7 @@ DEBUG_ADAPTER ?= dap
# For KW41Z, an OpenOCD version built from source is required. The support for # For KW41Z, an OpenOCD version built from source is required. The support for
# kw41z was introduced in # kw41z was introduced in
# https://github.com/ntfreak/openocd/2c8602ed9f084d6680cec7d0ca1d5dc71c865a5f # https://github.com/ntfreak/openocd/2c8602ed9f084d6680cec7d0ca1d5dc71c865a5f
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/openocd-$(CPU_FAMILY).cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/openocd-$(CPU_FAMILY).cfg
# Check the flash configuration field before flashing # Check the flash configuration field before flashing
export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh

2
boards/common/iotlab/Makefile.include
View File

@ -11,7 +11,7 @@ export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
DEBUG_ADAPTER ?= iotlab DEBUG_ADAPTER ?= iotlab
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/iotlab/dist/openocd.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/iotlab/dist/openocd.cfg
# this board uses openocd # this board uses openocd
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/common/nrf51/Makefile.include
View File

@ -11,7 +11,7 @@ endif
ifeq ($(PROGRAMMER),openocd) ifeq ($(PROGRAMMER),openocd)
# use common openocd configuration for nrf51 # use common openocd configuration for nrf51
export OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf51/dist/openocd.cfg OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf51/dist/openocd.cfg
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing # setup JLink for flashing

2
boards/common/nrf52/Makefile.include
View File

@ -58,6 +58,6 @@ else ifeq (openocd,$(PROGRAMMER))
$(BINDIR)/softdevice.hex: | $(ELFFILE) $(BINDIR)/softdevice.hex: | $(ELFFILE)
endif endif
DEBUG_ADAPTER ?= jlink DEBUG_ADAPTER ?= jlink
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nrf52/dist/openocd.cfg OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf52/dist/openocd.cfg
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
endif endif

2
makefiles/tools/openocd-adapters/stlink.inc.mk
View File

@ -19,6 +19,6 @@ ifeq (,$(OPENOCD_CONFIG))
# if no openocd default configuration is provided by the board, # if no openocd default configuration is provided by the board,
# use the STM32 common one # use the STM32 common one
ifeq (0,$(words $(wildcard $(BOARDSDIR)/$(BOARD)/dist/openocd.cfg))) ifeq (0,$(words $(wildcard $(BOARDSDIR)/$(BOARD)/dist/openocd.cfg)))
export OPENOCD_CONFIG := $(RIOTBASE)/boards/common/stm32/dist/$(CPU).cfg OPENOCD_CONFIG = $(RIOTBASE)/boards/common/stm32/dist/$(CPU).cfg
endif endif
endif endif