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

Merge pull request #11470 from cladmi/pr/nrf52/opencd/softdevice

Browse Source 
boards/common/nrf52: add openocd support for 'nordic_softdevice_ble'
This commit is contained in:
Alexandre Abadie 2019-09-11 15:33:08 +02:00 committed by GitHub
commit 23c1831473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,24 @@ else ifeq (openocd,$(PROGRAMMER))
# for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version # for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version
# build from source (master > 2018, August the 13rd) is required. # build from source (master > 2018, August the 13rd) is required.
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG))) ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
# openocd doesn't work (yet) with softdevice LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld
$(error Cannot use OpenOCD with nordic_softdevice module)
export OPENOCD_PRE_FLASH_CMDS += -c 'flash write_image erase "$(BINDIR)/softdevice.hex"'
export OPENOCD_PRE_VERIFY_CMDS += -c 'verify_image "$(BINDIR)/softdevice.hex"'
# Cannot use the 'ELFFILE' here
# The segments are 0x10000 aligned so padding bytes are copied and verified
#
# Using 'LINKFLAGS += -Wl,--nmagic' prevents it but would require
# dedicated testing/review
FLASHFILE ?= $(HEXFILE)
# murdock: softdevice.hex file is used for flashing
# It must be taken into account for the test input hash and
# be sent to the separated testing boards
TEST_EXTRA_FILES += $(BINDIR)/softdevice.hex
# Files in TEST_EXTRA_FILES need to have an explicit target
$(BINDIR)/softdevice.hex: | $(ELFFILE)
endif endif
DEBUG_ADAPTER ?= jlink DEBUG_ADAPTER ?= jlink
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nrf52/dist/openocd.cfg export OPENOCD_CONFIG := $(RIOTBOARD)/common/nrf52/dist/openocd.cfg