From c5d57a763efb4c965a14694cfdf63eefba8d7d2b Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Fri, 29 Aug 2014 21:13:13 +0200
Subject: [PATCH 1/3] OP-1465 - Update stm32flash repository to
 https://code.google.com/p/stm32flash/ and fetch a newer version
 (a358bd1f025d)

---
 make/tools.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index d66dd388d..28afd4732 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -1095,13 +1095,18 @@ openocd_clean:
 STM32FLASH_DIR := $(TOOLS_DIR)/stm32flash
 
 .PHONY: stm32flash_install
-stm32flash_install: STM32FLASH_URL := http://stm32flash.googlecode.com/svn/trunk
-stm32flash_install: STM32FLASH_REV := 61
+stm32flash_install: STM32FLASH_URL := https://code.google.com/p/stm32flash/
+stm32flash_install: STM32FLASH_REV := a358bd1f025d
 stm32flash_install: stm32flash_clean
         # download the source
 	$(V0) @echo " DOWNLOAD     $(STM32FLASH_URL) @ r$(STM32FLASH_REV)"
-	$(V1) svn export -q -r "$(STM32FLASH_REV)" "$(STM32FLASH_URL)" "$(STM32FLASH_DIR)"
-
+	$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
+	$(V1) mkdir -p "$(STM32FLASH_DIR)"
+	$(V1) git clone --no-checkout $(STM32FLASH_URL) "$(STM32FLASH_DIR)"
+	$(V1) ( \
+	  cd $(STM32FLASH_DIR) ; \
+	  git checkout -q $(STM32FLASH_REV) ; \
+	)
         # build
 	$(V0) @echo " BUILD        $(STM32FLASH_DIR)"
 	$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all

From ec07016aee74e5a9c64e28ea57f0bd784914115b Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Mon, 1 Sep 2014 14:51:43 +0200
Subject: [PATCH 2/3] OP-1465 - Fix build on windows, force the removal on
 cleanup

---
 make/tools.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index 28afd4732..afb1349dc 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -1093,7 +1093,9 @@ openocd_clean:
 	$(V1) [ ! -d "$(OPENOCD_DIR)" ] || $(RM) -r "$(OPENOCD_DIR)"
 
 STM32FLASH_DIR := $(TOOLS_DIR)/stm32flash
-
+ifeq ($(UNAME), Windows)
+	STM32FLASH_BUILD_OPTIONS := "CC=GCC"
+endif
 .PHONY: stm32flash_install
 stm32flash_install: STM32FLASH_URL := https://code.google.com/p/stm32flash/
 stm32flash_install: STM32FLASH_REV := a358bd1f025d
@@ -1109,12 +1111,12 @@ stm32flash_install: stm32flash_clean
 	)
         # build
 	$(V0) @echo " BUILD        $(STM32FLASH_DIR)"
-	$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all
+	$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all $(STM32FLASH_BUILD_OPTIONS) 
 
 .PHONY: stm32flash_clean
 stm32flash_clean:
 	$(V0) @echo " CLEAN        $(STM32FLASH_DIR)"
-	$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -r "$(STM32FLASH_DIR)"
+	$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
 
 DFUUTIL_DIR := $(TOOLS_DIR)/dfu-util
 

From 2907af618f7509a1f03d3f51301bc39764fa7aea Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Mon, 8 Sep 2014 14:39:41 +0200
Subject: [PATCH 3/3] OP-1465 - fixes for some review suggestions

---
 make/tools.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index afb1349dc..8303bd126 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -1101,21 +1101,21 @@ stm32flash_install: STM32FLASH_URL := https://code.google.com/p/stm32flash/
 stm32flash_install: STM32FLASH_REV := a358bd1f025d
 stm32flash_install: stm32flash_clean
         # download the source
-	$(V0) @echo " DOWNLOAD     $(STM32FLASH_URL) @ r$(STM32FLASH_REV)"
+	$(V0) @$(ECHO) " DOWNLOAD     $(STM32FLASH_URL) @ r$(STM32FLASH_REV)"
 	$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
-	$(V1) mkdir -p "$(STM32FLASH_DIR)"
-	$(V1) git clone --no-checkout $(STM32FLASH_URL) "$(STM32FLASH_DIR)"
+	$(V1) $(MKDIR) -p "$(STM32FLASH_DIR)"
+	$(V1) $(GIT) clone --no-checkout $(STM32FLASH_URL) "$(STM32FLASH_DIR)"
 	$(V1) ( \
-	  cd $(STM32FLASH_DIR) ; \
-	  git checkout -q $(STM32FLASH_REV) ; \
+	  $(CD) $(STM32FLASH_DIR) ; \
+	  $(GIT) checkout -q $(STM32FLASH_REV) ; \
 	)
         # build
-	$(V0) @echo " BUILD        $(STM32FLASH_DIR)"
+	$(V0) @$(ECHO) " BUILD        $(STM32FLASH_DIR)"
 	$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all $(STM32FLASH_BUILD_OPTIONS) 
 
 .PHONY: stm32flash_clean
 stm32flash_clean:
-	$(V0) @echo " CLEAN        $(STM32FLASH_DIR)"
+	$(V0) @$(ECHO) " CLEAN        $(STM32FLASH_DIR)"
 	$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
 
 DFUUTIL_DIR := $(TOOLS_DIR)/dfu-util