Update to latest commit & latest toolchian

4 files changed, 32 insertions, 24 deletions

diff --git a/devel/libopencm3/Makefile b/devel/libopencm3/Makefile
index 01fde26eb77c..2f8c3efa5599 100644
--- a/devel/libopencm3/Makefile
+++ b/devel/libopencm3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libopencm3
-PORTVERSION=	0.0.20160110
+PORTVERSION=	0.0.20160319
 CATEGORIES=	devel
 
 MAINTAINER=	lev@FreeBSD.org
@@ -13,15 +13,15 @@ BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-n
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libopencm3
-GH_TAGNAME=	ad5ec6a
+GH_TAGNAME=	d3fff11
 
 USES=		gmake python:2,build shebangfix
 
 SHEBANG_FILES=	scripts/irq2nvic_h \
 		scripts/lpcvtcksum
 
-TOOLCHAIN_FULL_VERSION?=5_2-2015q4-20151219
-TOOLCHAIN_PORT_VERSION?=5.2.20151219
+TOOLCHAIN_FULL_VERSION?=5_3-2016q1-20160330
+TOOLCHAIN_PORT_VERSION?=5.3.20160330
 TOOLCHAIN_TARGET?=arm-none-eabi
 
 DESTDIRNAME=	STAGEDIR
diff --git a/devel/libopencm3/distinfo b/devel/libopencm3/distinfo
index d1fb25207449..316352a7dffc 100644
--- a/devel/libopencm3/distinfo
+++ b/devel/libopencm3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libopencm3-libopencm3-0.0.20160110-ad5ec6a_GH0.tar.gz) = 1ed709349b5973270b66c09d220f617c973e32f86e0830c2ccc0b5bf63e46e74
-SIZE (libopencm3-libopencm3-0.0.20160110-ad5ec6a_GH0.tar.gz) = 670966
+SHA256 (libopencm3-libopencm3-0.0.20160319-d3fff11_GH0.tar.gz) = a3f60541e0a4628056ef09bc12f47eeae1352c60a5326d22049e2087b6357577
+SIZE (libopencm3-libopencm3-0.0.20160319-d3fff11_GH0.tar.gz) = 678232
diff --git a/devel/libopencm3/files/patch-Makefile b/devel/libopencm3/files/patch-Makefile
index 6f96086e1bfa..70dd32cbeccf 100644
--- a/devel/libopencm3/files/patch-Makefile
+++ b/devel/libopencm3/files/patch-Makefile
@@ -1,20 +1,28 @@
---- Makefile.orig	2016-01-21 01:07:59.465866154 +0300
-+++ Makefile	2016-01-21 01:09:35.673836966 +0300
-@@ -23,6 +23,13 @@ PREFIX		?= arm-none-eabi
+--- Makefile.orig	2016-04-12 01:57:55.000000000 +0300
++++ Makefile	2016-04-22 15:20:16.000000000 +0300
+@@ -17,12 +17,19 @@
+ ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ ##
+ 
+-PREFIX		?= arm-none-eabi
+-#PREFIX		?= arm-elf
++TARGET		?= arm-none-eabi
++#TARGET		?= arm-elf
+ 
  STYLECHECK      := scripts/checkpatch.pl
  STYLECHECKFLAGS := --no-tree -f --terse --mailback
  
 +DESTDIR		?= /usr/local
 +
-+INCDIR		:= $(DESTDIR)/$(PREFIX)/include
-+LIBDIR		:= $(DESTDIR)/$(PREFIX)/lib
-+SHAREDIR	:= $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
++INCDIR		:= $(DESTDIR)/$(TARGET)/include
++LIBDIR		:= $(DESTDIR)/$(TARGET)/lib
++SHAREDIR	:= $(DESTDIR)/$(TARGET)/share/libopencm3/scripts
 +INSTALL		:= install
 +
  space:=
  space+=
  SRCLIBDIR:= $(subst $(space),\$(space),$(realpath lib))
-@@ -64,6 +71,23 @@ $(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
+@@ -64,6 +71,18 @@ $(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
  lib: $(LIB_DIRS)
  	$(Q)true
  
@@ -23,22 +31,17 @@
 +	$(Q)$(INSTALL) -d $(INCDIR)/libopencm3
 +	$(Q)$(INSTALL) -d $(INCDIR)/libopencmsis
 +	$(Q)$(INSTALL) -d $(LIBDIR)
-+	$(Q)$(INSTALL) -d $(SHAREDIR)
 +	$(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
 +	$(Q)cp -r include/libopencmsis/* $(INCDIR)/libopencmsis
 +	@printf "  INSTALL libs\n"
 +	$(Q)$(INSTALL) -m 0644 lib/*.a $(LIBDIR)
 +	@printf "  INSTALL ldscripts\n"
 +	$(Q)$(INSTALL) -m 0644 lib/*.ld $(LIBDIR)
-+	$(Q)$(INSTALL) -m 0644 lib/efm32/*/*.ld $(LIBDIR)
-+	@printf "  INSTALL scripts\n"
-+	$(Q)$(INSTALL) -m 0644 scripts/*.scr $(SHAREDIR)
-+
 +
  html doc:
  	$(Q)$(MAKE) -C doc html
  
-@@ -106,4 +130,4 @@ genlinktests: $(LDTESTS:.data=.ldtest)
+@@ -106,4 +125,4 @@ genlinktests: $(LDTESTS:.data=.ldtest)
  	fi;
  
  
diff --git a/devel/libopencm3/pkg-plist b/devel/libopencm3/pkg-plist
index 3542fb582894..3b0f3bc165af 100644
--- a/devel/libopencm3/pkg-plist
+++ b/devel/libopencm3/pkg-plist
@@ -193,6 +193,9 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/adc.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/can.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/cec.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/adc_common_v1.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/adc_common_v2.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/adc_common_v2_multi.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/adc_common_v2_single.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/crc_common_all.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/crs_common_all.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/crypto_common_f24.h
@@ -228,6 +231,7 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/tim
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/usart_common_all.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/usart_common_f124.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/usart_common_f24.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/common/usart_common_v2.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/comparator.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/crc.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/crs.h
@@ -364,6 +368,7 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/gpio.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/hash.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/i2c.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/iwdg.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l0/adc.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l0/doc-stm32l0.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l0/exti.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l0/gpio.h
@@ -397,11 +402,16 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/st_usbf
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/syscfg.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/timer.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/usart.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/adc.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/doc-stm32l4.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/flash.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/gpio.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/irq.json
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/memorymap.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/nvic.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/pwr.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/rcc.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/timer.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/ltdc.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/memorymap.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/otg_common.h
@@ -465,15 +475,12 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/l4/irqha
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/vf6xx/irqhandlers.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32g.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32g.ld
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32g880f128.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32gg.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32gg.ld
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32gg990f1024.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32lg.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32lg.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32tg.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32tg.ld
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32tg840f32.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_lm3s.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_lm3s.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_lm4f.a
@@ -517,5 +524,3 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l4.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l4.ld
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_vf6xx.a
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_vf6xx.ld
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_debug.scr
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_flash.scr