Index: head/sysutils/atf-master/Makefile
===================================================================
--- head/sysutils/atf-master/Makefile	(revision 499208)
+++ head/sysutils/atf-master/Makefile	(revision 499209)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	atf
 PORTVERSION?=	${ATF_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${PLAT}
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	ARM TF-A for platform ${PLAT}
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USES=	gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ARM-software
 GH_PROJECT=	arm-trusted-firmware
 GH_TAGNAME=	${ATF_VERSION}
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
 ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 bl31
 
 # Default to the latest release
-ATF_VERSION?=	v2.0
+ATF_VERSION?=	v2.1
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 
 DESCR?=		${.CURDIR}/pkg-descr
 
 NO_ARCH=	yes
 
 .if !defined(PLAT)
 PLAT=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/sysutils/atf-master/distinfo
===================================================================
--- head/sysutils/atf-master/distinfo	(revision 499208)
+++ head/sysutils/atf-master/distinfo	(revision 499209)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1549380665
-SHA256 (ARM-software-arm-trusted-firmware-v2.0_GH0.tar.gz) = 7d699a1683bb7a5909de37b6eb91b6e38db32cd6fc5ae48a08eb0718d6504ae4
-SIZE (ARM-software-arm-trusted-firmware-v2.0_GH0.tar.gz) = 3058755
-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
+TIMESTAMP = 1555532999
+SHA256 (ARM-software-arm-trusted-firmware-v2.1_GH0.tar.gz) = 7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059
+SIZE (ARM-software-arm-trusted-firmware-v2.1_GH0.tar.gz) = 3670018
Index: head/sysutils/atf-sun50i_a64/Makefile
===================================================================
--- head/sysutils/atf-sun50i_a64/Makefile	(revision 499208)
+++ head/sysutils/atf-sun50i_a64/Makefile	(revision 499209)
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../atf-master
 
-PORTVERSION=	2.0.20181123
-ATF_VERSION=	98aab97
 PLAT=	sun50i_a64
 BL31=	bl31.bin
 
 .include "${MASTERDIR}/Makefile"