diff --git a/boards/hifive1/dist/flasher.sh b/boards/hifive1/dist/flasher.sh
index df2b36eee59268bf7fff1838e2daf0b8eaadbc3c..1f73cea8012252bb26533f880ae81006755eeb03 100644
--- a/boards/hifive1/dist/flasher.sh
+++ b/boards/hifive1/dist/flasher.sh
@@ -19,15 +19,18 @@
#
# The script supports the following actions:
#
-# flash: flash a given ELF file to the target.
+# flash: flash <image_file>
+# flash given file to the target.
#
# options:
-# IMAGE_FILE: Filename of the file that will be flashed
+# <image_file>: Filename of the file that will be flashed
# PRE_FLASH_CHECK_SCRIPT: a command to run before flashing to
-# verify the integrity of the image to be flashed. ELFFILE is
+# verify the integrity of the image to be flashed. <image_file> is
# passed as a command line argument to this command.
-# Even though the file name variable is named ELFFILE, flashing
-# works with any file format recognized by OpenOCD (elf, ihex, s19, bin).
+#
+# Flashing works with any file format recognized by OpenOCD
+# (elf, ihex, s19, bin).
+#
#
# @author Hauke Peteresen <hauke.petersen@fu-berlin.de>
# @author Joakim Nohlgård <joakim.nohlgard@eistec.se>
@@ -42,10 +45,6 @@
# Default offset is 0, meaning the image will be flashed at the address that it
# was linked at.
: ${IMAGE_OFFSET:=0}
-# Image file used for flashing. Must be in a format that OpenOCD can handle (ELF,
-# Intel hex, S19, or raw binary)
-# Default is to use $ELFFILE
-: ${IMAGE_FILE:=${ELFFILE}}
# Type of image, leave empty to let OpenOCD automatically detect the type from
# the file (default).
# Valid values: elf, hex, s19, bin (see OpenOCD manual for more information)
@@ -84,6 +83,7 @@ test_imagefile() {
# now comes the actual actions
#
do_flash() {
+ IMAGE_FILE=$1
test_config
test_imagefile
if [ -n "${PRE_FLASH_CHECK_SCRIPT}" ]; then
@@ -119,14 +119,15 @@ do_flash() {
# parameter dispatching
#
ACTION="$1"
+shift # pop $1 from $@
case "${ACTION}" in
flash)
echo "### Flashing Target ###"
- do_flash
+ do_flash "$@"
;;
*)
- echo "Usage: $0 flash"
+ echo "Usage: $0 flash <flashfile>"
exit 2
;;
esac
diff --git a/boards/seeeduino_arch-pro/Makefile.include b/boards/seeeduino_arch-pro/Makefile.include
index 4d78e552fdb0e5b2d753450c5db43d06465891de..aa957e7bcd136f187ecb33ed29061fce8a8ff0a6 100644
--- a/boards/seeeduino_arch-pro/Makefile.include
+++ b/boards/seeeduino_arch-pro/Makefile.include
@@ -11,7 +11,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
DEBUG_ADAPTER ?= dap
# this board uses openocd
-export IMAGE_FILE = $(HEXFILE)
+FFLAGS ?= flash $(HEXFILE)
include $(RIOTMAKE)/tools/openocd.inc.mk
# generate image checksum from hex file
diff --git a/dist/tools/openocd/openocd.sh b/dist/tools/openocd/openocd.sh
index 4973f8fb4563baa05247d414a6462f9ef191449e..d9b0a4959d251ee5d63c6ba14340ed3bb296b810 100755
--- a/dist/tools/openocd/openocd.sh
+++ b/dist/tools/openocd/openocd.sh
@@ -17,30 +17,33 @@
#
# The script supports the following actions:
#
-# flash: flash a given ELF file to the target.
+# flash: flash <image_file>
+# flash given file to the target.
#
# options:
-# IMAGE_FILE: Filename of the file that will be flashed
+# <image_file>: Filename of the file that will be flashed
# PRE_FLASH_CHECK_SCRIPT: a command to run before flashing to
-# verify the integrity of the image to be flashed. ELFFILE is
+# verify the integrity of the image to be flashed. <image_file> is
# passed as a command line argument to this command.
-# Even though the file name variable is named ELFFILE, flashing
-# works with any file format recognized by OpenOCD (elf, ihex, s19, bin).
#
-# debug: starts OpenOCD as GDB server in the background and
+# Flashing works with any file format recognized by OpenOCD
+# (elf, ihex, s19, bin).
+#
+# debug: debug <elfile>
+# starts OpenOCD as GDB server in the background and
# connects to the server with the GDB client specified by
# the board
#
# options:
+# <elffile>: path to the file to debug, must be in a format
+# recognized by GDB (preferably ELF, it will not
+# work with .bin, .hex or .s19 because they lack
+# symbol information)
# GDB_PORT: port opened for GDB connections
# TCL_PORT: port opened for TCL connections
# TELNET_PORT: port opened for telnet connections
# DBG: debugger client command, default: 'gdb -q'
# TUI: if TUI!=null, the -tui option will be used
-# ELFFILE: path to the file to debug, must be in a format
-# recognized by GDB (preferably ELF, it will not
-# work with .bin, .hex or .s19 because they lack
-# symbol information)
#
# debug-server: starts OpenOCD as GDB server, but does not connect to
# to it with any frontend. This might be useful when using
@@ -93,10 +96,6 @@
# Default offset is 0, meaning the image will be flashed at the address that it
# was linked at.
: ${IMAGE_OFFSET:=0}
-# Image file used for flashing. Must be in a format that OpenOCD can handle (ELF,
-# Intel hex, S19, or raw binary)
-# Default is to use $ELFFILE
-: ${IMAGE_FILE:=${ELFFILE}}
# Type of image, leave empty to let OpenOCD automatically detect the type from
# the file (default).
# Valid values: elf, hex, s19, bin (see OpenOCD manual for more information)
@@ -210,6 +209,7 @@ _flash_address() {
# now comes the actual actions
#
do_flash() {
+ IMAGE_FILE=$1
test_config
test_imagefile
if [ -n "${PRE_FLASH_CHECK_SCRIPT}" ]; then
@@ -256,6 +256,7 @@ do_flash() {
}
do_debug() {
+ ELFFILE=$1
test_config
test_elffile
# temporary file that saves OpenOCD pid
@@ -330,15 +331,16 @@ do_reset() {
# parameter dispatching
#
ACTION="$1"
+shift # pop $1 from $@
case "${ACTION}" in
flash)
echo "### Flashing Target ###"
- do_flash
+ do_flash "$@"
;;
debug)
echo "### Starting Debugging ###"
- do_debug
+ do_debug "$@"
;;
debug-server)
echo "### Starting GDB Server ###"
@@ -350,6 +352,8 @@ case "${ACTION}" in
;;
*)
echo "Usage: $0 {flash|debug|debug-server|reset}"
+ echo " flash <flashfile>"
+ echo " debug <elffile>"
exit 2
;;
esac
diff --git a/makefiles/tools/openocd.inc.mk b/makefiles/tools/openocd.inc.mk
index 79d2e5390e5027b16293735d90a8a278bc141651..a307d93f4697aee228da7f623be00ccb7f3e1049 100644
--- a/makefiles/tools/openocd.inc.mk
+++ b/makefiles/tools/openocd.inc.mk
@@ -3,8 +3,8 @@ export DEBUGGER = $(RIOTTOOLS)/openocd/openocd.sh
export DEBUGSERVER = $(RIOTTOOLS)/openocd/openocd.sh
export RESET ?= $(RIOTTOOLS)/openocd/openocd.sh
-export FFLAGS ?= flash
-export DEBUGGER_FLAGS ?= debug
+export FFLAGS ?= flash $(ELFFILE)
+export DEBUGGER_FLAGS ?= debug $(ELFFILE)
export DEBUGSERVER_FLAGS ?= debug-server
export RESET_FLAGS ?= reset