Index: head/sysutils/atf-allwinner/Makefile
===================================================================
--- head/sysutils/atf-allwinner/Makefile
+++ head/sysutils/atf-allwinner/Makefile
@@ -1,33 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	atf-allwinner
-PORTVERSION=	1.2.20180403
+PORTVERSION=	2.0.20181123
 CATEGORIES=	sysutils
 MASTER_SITES=	GH
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT=	Arm Trusted Framework for Allwinner SoCs
 
-LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+
-LICENSE_COMB=	multi
-LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/license.md
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	apritzel
+GH_ACCOUNT=	ARM-software
 GH_PROJECT=	arm-trusted-firmware
-GH_TAGNAME=	c9f55c0
+GH_TAGNAME=	98aab97
 
 SSP_UNSAFE=	yes
 USES=	gmake
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
-ALL_TARGET=	PLAT=sun50iw1p1 bl31
+ALL_TARGET=	ARCH="aarch64" PLAT=sun50i_a64 V=1 bl31
 
 PLIST_FILES=	${PREFIX}/share/${PORTNAME}/bl31.bin
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/build/sun50iw1p1/release/bl31.bin ${STAGEDIR}/${PREFIX}/share/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/build/sun50i_a64/release/bl31.bin ${STAGEDIR}/${PREFIX}/share/${PORTNAME}/
 
 .include <bsd.port.mk>
Index: head/sysutils/atf-allwinner/distinfo
===================================================================
--- head/sysutils/atf-allwinner/distinfo
+++ head/sysutils/atf-allwinner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538668056
-SHA256 (apritzel-arm-trusted-firmware-1.2.20180403-c9f55c0_GH0.tar.gz) = a62c89c162b76082ceb91d9d475ec4ee5386ad03125177136d7bbdb161b9957a
-SIZE (apritzel-arm-trusted-firmware-1.2.20180403-c9f55c0_GH0.tar.gz) = 752112
+TIMESTAMP = 1542995778
+SHA256 (ARM-software-arm-trusted-firmware-2.0.20181123-98aab97_GH0.tar.gz) = e5496f84f6cd550ed494d83e3c82fb75d8ebeb3d3034aa741e62cbdccfdc761c
+SIZE (ARM-software-arm-trusted-firmware-2.0.20181123-98aab97_GH0.tar.gz) = 3385437