From 346784ef8e3ab9509c234b3acf82abf51763afdf Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Apr 2021 22:40:31 -0700 Subject: [PATCH] stm32flash: update to 0.6 Switch to AUTORELEASE for simplicity. Use autotools build. Remove upstream patch. Minor cleanups for consistency between packages. Signed-off-by: Rosen Penev --- utils/stm32flash/Makefile | 14 +++++++++----- .../patches/100-add_support_for_stm32g4.patch | 11 ----------- 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 utils/stm32flash/patches/100-add_support_for_stm32g4.patch diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile index b6f73d9394..b2cdbadf6b 100644 --- a/utils/stm32flash/Makefile +++ b/utils/stm32flash/Makefile @@ -8,16 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stm32flash -PKG_VERSION:=0.5 -PKG_RELEASE:=3 +PKG_VERSION:=0.6 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_HASH:=ee9b40d4d3e5cd28b993e08ae2a2c3c559b6bea8730cd7e1d40727dedb1dda09 + PKG_MAINTAINER:=Christian Pointner PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=gpl-2.0.txt + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/stm32flash @@ -35,7 +39,7 @@ endef define Package/stm32flash/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/stm32flash $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stm32flash $(1)/usr/bin/ endef $(eval $(call BuildPackage,stm32flash)) diff --git a/utils/stm32flash/patches/100-add_support_for_stm32g4.patch b/utils/stm32flash/patches/100-add_support_for_stm32g4.patch deleted file mode 100644 index f4ec0dbb24..0000000000 --- a/utils/stm32flash/patches/100-add_support_for_stm32g4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/dev_table.c -+++ b/dev_table.c -@@ -90,6 +90,8 @@ const stm32_dev_t devices[] = { - {0x434, "STM32F469xx" , 0x20003000, 0x20060000, 0x08000000, 0x08200000, 1, f4db , 0x1FFEC000, 0x1FFFC00F, 0x1FFF0000, 0x1FFF7800, 0}, - /* F7 */ - {0x449, "STM32F74xxx/75xxx" , 0x20004000, 0x20050000, 0x08000000, 0x08100000, 1, f7 , 0x1FFF0000, 0x1FFF001F, 0x1FF00000, 0x1FF0EDC0, 0}, -+ /* G4 */ -+ {0x468, "STM32G431xx/441xx" , 0x20000000, 0x20004000, 0x08000000, 0x08020000, 1, p_2k , 0x1FFF7800, 0x1FFF780F, 0x1FFF0000, 0x1FFF7000, 0}, - /* L0 */ - {0x425, "STM32L031xx/041xx" , 0x20001000, 0x20002000, 0x08000000, 0x08008000, 32, p_128 , 0x1FF80000, 0x1FF8001F, 0x1FF00000, 0x1FF01000, 0}, - {0x417, "STM32L05xxx/06xxx" , 0x20001000, 0x20002000, 0x08000000, 0x08010000, 32, p_128 , 0x1FF80000, 0x1FF8001F, 0x1FF00000, 0x1FF01000, 0},