From 6a559f1924ba37ddbbf07eed04185364c9fef83f Mon Sep 17 00:00:00 2001
From: Corentin 'Kmikaz' Vigourt <cvigourt@scallog.com>
Date: Thu, 12 Mar 2020 12:48:38 +0100
Subject: [PATCH] makefiles/boards/stm32.ink.mk: Use ROM_OFFSET with stm32flash

---
 makefiles/boards/stm32.inc.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/makefiles/boards/stm32.inc.mk b/makefiles/boards/stm32.inc.mk
index c8b908674e..ba7b6b5021 100644
--- a/makefiles/boards/stm32.inc.mk
+++ b/makefiles/boards/stm32.inc.mk
@@ -58,9 +58,11 @@ ifeq (dfu-util,$(PROGRAMMER))
 endif
 
 ifeq (stm32flash,$(PROGRAMMER))
+	ROM_OFFSET ?= 0x0
 	FLASHER = stm32flash
 	DEBUGGER =
 	FLASHFILE ?= $(BINFILE)
 	PROG_BAUD ?= 57600
-	FFLAGS = -b $(PROG_BAUD) -w $(FLASHFILE) -g 0x0 $(PORT)
+	BIN_ADDR ?= $(shell echo  $$(($(ROM_START_ADDR) + $(ROM_OFFSET))))
+	FFLAGS = -v -b $(PROG_BAUD) -w $(FLASHFILE) -S $(BIN_ADDR) -g $(BIN_ADDR) $(PORT)
 endif