From 7653bbfb219e841b2fb538bb7c7d2b47b6dec817 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 14 Jun 2014 07:54:52 +0200
Subject: [PATCH 1/2] import stm32flash

---
 utils/stm32flash/Makefile                     | 40 +++++++++++++++++++
 .../patches/001-cflags_override.patch         | 30 ++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 utils/stm32flash/Makefile
 create mode 100644 utils/stm32flash/patches/001-cflags_override.patch

diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile
new file mode 100644
index 000000000..19d2d47bf
--- /dev/null
+++ b/utils/stm32flash/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=stm32flash
+PKG_REV:=61
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://stm32flash.googlecode.com/svn/trunk
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=svn
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/stm32flash
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=http://code.google.com/p/stm32flash/
+  TITLE:=Firmware flash tool for STM32's serial bootloader
+endef
+
+define Package/stm32flash/description
+  This tool can be used to burn firmware images to STM32 ARM processors
+  using the built-in serial bootloader.
+endef
+
+define Package/stm32flash/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stm32flash $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,stm32flash))
diff --git a/utils/stm32flash/patches/001-cflags_override.patch b/utils/stm32flash/patches/001-cflags_override.patch
new file mode 100644
index 000000000..d8ba6f81a
--- /dev/null
+++ b/utils/stm32flash/patches/001-cflags_override.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@ export AR
+ 
+ all:
+ 	$(MAKE) -C parsers
+-	$(CC) -g -o stm32flash -I./ \
++	$(CC) $(LDFLAGS) -o stm32flash -I./ \
+ 		main.c \
+ 		utils.c \
+ 		stm32.c \
+@@ -13,7 +13,7 @@ all:
+ 		serial_platform.c \
+ 		parsers/parsers.a \
+ 		stm32/stmreset_binary.c \
+-		-Wall
++		$(CFLAGS)
+ 
+ clean:
+ 	$(MAKE) -C parsers clean
+--- a/parsers/Makefile
++++ b/parsers/Makefile
+@@ -1,6 +1,6 @@
+ 
+ all:
+-	$(CC) -g -Wall -c -I../ binary.c hex.c
++	$(CC) $(CFLAGS) -Wall -c -I../ binary.c hex.c
+ 	$(AR) r parsers.a        binary.o hex.o
+ 
+ clean:

From 55f4b33795b838d1500747beb63d2016db47afa7 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 14 Jun 2014 08:44:26 +0200
Subject: [PATCH 2/2] upgraded to stm32flash to newest revision set myself as
 Maintainer dropped outdated patches

---
 utils/stm32flash/Makefile                     | 11 +++----
 .../patches/001-cflags_override.patch         | 30 -------------------
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 utils/stm32flash/patches/001-cflags_override.patch

diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile
index 19d2d47bf..2da07890a 100644
--- a/utils/stm32flash/Makefile
+++ b/utils/stm32flash/Makefile
@@ -8,21 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stm32flash
-PKG_REV:=61
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=2
+PKG_REV:=4d7ce45
+PKG_VERSION:=git~$(PKG_REV)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://stm32flash.googlecode.com/svn/trunk
+PKG_SOURCE_URL:=git://gitorious.org/stm32flash/stm32flash.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/stm32flash
   SECTION:=utils
   CATEGORY:=Utilities
+  MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
   URL:=http://code.google.com/p/stm32flash/
   TITLE:=Firmware flash tool for STM32's serial bootloader
 endef
diff --git a/utils/stm32flash/patches/001-cflags_override.patch b/utils/stm32flash/patches/001-cflags_override.patch
deleted file mode 100644
index d8ba6f81a..000000000
--- a/utils/stm32flash/patches/001-cflags_override.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@ export AR
- 
- all:
- 	$(MAKE) -C parsers
--	$(CC) -g -o stm32flash -I./ \
-+	$(CC) $(LDFLAGS) -o stm32flash -I./ \
- 		main.c \
- 		utils.c \
- 		stm32.c \
-@@ -13,7 +13,7 @@ all:
- 		serial_platform.c \
- 		parsers/parsers.a \
- 		stm32/stmreset_binary.c \
--		-Wall
-+		$(CFLAGS)
- 
- clean:
- 	$(MAKE) -C parsers clean
---- a/parsers/Makefile
-+++ b/parsers/Makefile
-@@ -1,6 +1,6 @@
- 
- all:
--	$(CC) -g -Wall -c -I../ binary.c hex.c
-+	$(CC) $(CFLAGS) -Wall -c -I../ binary.c hex.c
- 	$(AR) r parsers.a        binary.o hex.o
- 
- clean: