From 44da86f2ee97b89d2ca9941678da2cbf9026f140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 26 Mar 2018 18:26:38 +0200 Subject: [PATCH] calliope-mini/flash: get HEXFILE from cli --- boards/calliope-mini/Makefile.include | 2 +- boards/calliope-mini/dist/flash.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index 6f969e2c20..fa17c41591 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -10,7 +10,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PROGRAMMER ?= fscopy ifeq (fscopy,$(PROGRAMMER)) - export FFLAGS = + export FFLAGS = $(HEXFILE) export DEBUGGER_FLAGS = export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh diff --git a/boards/calliope-mini/dist/flash.sh b/boards/calliope-mini/dist/flash.sh index 9b4630f966..fa8ce4f26c 100755 --- a/boards/calliope-mini/dist/flash.sh +++ b/boards/calliope-mini/dist/flash.sh @@ -18,6 +18,8 @@ OS=`uname` DID_MOUNT=false NAME="MINI" +HEXFILE=$1 + # set the mount path depending on the OS if [ ${OS} = "Linux" ] then