cpu/nRF52: Always recover Device before Flashing

boards/common/nrf52/Makefile.include

@@ -18,8 +18,12 @@ else
   PROGRAMMER ?= openocd
 endif
 
-# setup OpenOCD for flashing. Version 0.10 of OpenOCD doesn't contain support
-# for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version
-# build from source (master > 2018, August the 13rd) is required.
+# Setup OpenOCD for flashing. The nRF52 series is supported from OpenOCD v0.11
+# onwards.
 OPENOCD_DEBUG_ADAPTER ?= jlink
 OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf52/dist/openocd.cfg
+
+# From Build Code Fxx and later, the nRF52 device is automatically locked after
+# a power cycle and has to be recovered with a separate command after the
+# initialization. Otherwise the Flash can not be accessed.
+OPENOCD_POST_INIT_CMDS = -c 'nrf52_recover'

dist/tools/openocd/openocd.sh

@@ -98,23 +98,23 @@
 # Default OpenOCD command
 : ${OPENOCD:=openocd}
 # Extra board initialization commands to pass to OpenOCD
 : ${OPENOCD_EXTRA_INIT:=}
 # Debugger interface initialization commands to pass to OpenOCD
 : ${OPENOCD_ADAPTER_INIT:=}
 # If set to 1 'reset_config' will use 'connect_assert_srst' before 'flash' or 'reset.
 : ${OPENOCD_RESET_USE_CONNECT_ASSERT_SRST:=}
 # Default bind address for OpenOCD
 : ${OPENOCD_SERVER_ADDRESS:=localhost}
 # The setsid command is needed so that Ctrl+C in GDB doesn't kill OpenOCD
 : ${SETSID:=setsid}
 # GDB command, usually a separate command for each platform (e.g. arm-none-eabi-gdb)
 : ${GDB:=gdb}
 # Debugger client command, can be used to wrap GDB in a front-end
 : ${DBG:=${GDB}}
 # Default debugger flags,
 : ${DBG_DEFAULT_FLAGS:=-q -ex \"tar ext ${OPENOCD_SERVER_ADDRESS}:$(( GDB_PORT + GDB_PORT_CORE_OFFSET ))\"}
 # Extra debugger flags, added by the user
 : ${DBG_EXTRA_FLAGS:=}
 # Debugger flags, will be passed to sh -c, remember to escape any quotation signs.
 # Use ${DBG_DEFAULT_FLAGS} to insert the default flags anywhere in the string
 : ${DBG_FLAGS:=${DBG_DEFAULT_FLAGS} ${DBG_EXTRA_FLAGS}}
@@ -346,6 +346,7 @@
             -c 'telnet_port 0' \
             -c 'gdb_port 0' \
             -c 'init' \
+            ${OPENOCD_POST_INIT_CMDS} \
             -c 'targets' \
             ${OPENOCD_CMD_RESET_HALT} \
             ${OPENOCD_PRE_FLASH_CMDS} \

makefiles/tools/openocd.inc.mk

@@ -34,6 +34,12 @@ $(call target-export-variables,$(OPENOCD_TARGETS),OPENOCD_CORE)
 # Export OPENOCD_ADAPTER_INIT to required targets
 $(call target-export-variables,$(OPENOCD_TARGETS),OPENOCD_ADAPTER_INIT)
 
+# Export OPENOCD_EXTRA_INIT to required targets
+$(call target-export-variables,$(OPENOCD_TARGETS),OPENOCD_EXTRA_INIT)
+
+# Export OPENOCD_EXTRA_RESET_INIT to required targets
+$(call target-export-variables,$(OPENOCD_TARGETS),OPENOCD_EXTRA_RESET_INIT)
+
 # Export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST to required targets
 $(call target-export-variables,$(OPENOCD_TARGETS),OPENOCD_RESET_USE_CONNECT_ASSERT_SRST)
 
@@ -67,6 +73,11 @@ ifneq (,$(IMAGE_OFFSET))
   $(call target-export-variables,$(OPENOCD_FLASH_TARGETS),IMAGE_OFFSET)
 endif
 
+ifneq (,$(OPENOCD_POST_INIT_CMDS))
+  # Export OPENOCD_POST_INIT_CMDS only to the flash/flash-only target
+  $(call target-export-variables,$(OPENOCD_FLASH_TARGETS),OPENOCD_POST_INIT_CMDS)
+endif
+
 ifneq (,$(OPENOCD_PRE_VERIFY_CMDS))
   # Export OPENOCD_PRE_VERIFY_CMDS only to the flash/flash-only target
   $(call target-export-variables,$(OPENOCD_FLASH_TARGETS),OPENOCD_PRE_VERIFY_CMDS)