Merge pull request #12158 from aabadie/pr/boards/stm32_connect_assert…

…_srst boards/stm32: generalize use of connect_assert_srst for flashing
RIOT-OS · Sep 23, 2019 · 8467dba · 8467dba
2 parents abdebaa + e45388e
commit 8467dba
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/boards/b-l072z-lrwan1/Makefile.include b/boards/b-l072z-lrwan1/Makefile.include
@@ -11,8 +11,9 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # this board has an on-board ST-link adapter
 DEBUG_ADAPTER ?= stlink
 
-# call a 'reset halt' command before starting the debugger
-export OPENOCD_DBG_START_CMD = -c 'reset halt'
+# this board can become un-flashable after a hardfault,
+# use connect_assert_srst to always be able to flash or reset the board.
+export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk
diff --git a/boards/common/nucleo/Makefile.include b/boards/common/nucleo/Makefile.include
@@ -12,6 +12,10 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
+# nucleo boards can become un-flashable after a hardfault,
+# use connect_assert_srst to always be able to flash or reset the boards.
+export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
+
 # all Nucleo boards have an on-board ST-link adapter
 DEBUG_ADAPTER ?= stlink
 

diff --git a/boards/common/stm32/dist/stm32l0.cfg b/boards/common/stm32/dist/stm32l0.cfg
@@ -5,5 +5,5 @@ try {
     puts "WARNING: Your Openocd version does not support dual bank flash on your board. Falling back to single bank flashing."
     source [find target/stm32l0.cfg]
 }
-reset_config srst_only connect_assert_srst
+reset_config srst_only
 $_TARGETNAME configure -rtos auto
diff --git a/boards/i-nucleo-lrwan1/Makefile.include b/boards/i-nucleo-lrwan1/Makefile.include
@@ -11,8 +11,9 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # to flash this board, use an ST-link adapter
 DEBUG_ADAPTER ?= stlink
 
-# call a 'reset halt' command before starting the debugger
-export OPENOCD_DBG_START_CMD = -c 'reset halt'
+# this board can become un-flashable after a hardfault,
+# use connect_assert_srst to always be able to flash or reset the boards.
+export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk
diff --git a/boards/lsn50/Makefile.include b/boards/lsn50/Makefile.include
@@ -11,8 +11,9 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # By default, flash this board using an ST-link adapter
 DEBUG_ADAPTER ?= stlink
 
-# call a 'reset halt' command before starting the debugger
-export OPENOCD_DBG_START_CMD = -c 'reset halt'
+# this board can become un-flashable after a hardfault,
+# use connect_assert_srst to always be able to flash or reset the boards.
+export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk
diff --git a/boards/nucleo-f091rc/Makefile.include b/boards/nucleo-f091rc/Makefile.include
@@ -1,6 +1,2 @@
-# nucleo-f091rc can become un-flashable after a hardfault, use connect_assert_srst
-# to always be able to flash or reset the board.
-export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
-
 # load the common Makefile.include for Nucleo boards
 include $(RIOTBOARD)/common/nucleo64/Makefile.include