Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -61,6 +61,7 @@
     SUBDIR += asmem
     SUBDIR += asmon
     SUBDIR += asusoled
+    SUBDIR += atf-fvp
     SUBDIR += atf-master
     SUBDIR += atf-rk3328
     SUBDIR += atf-rk3399
Index: sysutils/atf-fvp/Makefile
===================================================================
--- /dev/null
+++ sysutils/atf-fvp/Makefile
@@ -0,0 +1,10 @@
+MASTERDIR=	${.CURDIR}/../atf-master
+
+PLAT=		fvp
+BL31=		bl1.bin
+FIP=		fip.bin
+ATF_TARGET=	bl1 dtbs fip BL33=${LOCALBASE}/share/edk2-fvp/FVP_AARCH64_EFI.fd
+
+BUILD_DEPENDS+=	${LOCALBASE}/share/edk2-fvp/FVP_AARCH64_EFI.fd:sysutils/edk2@fvp
+
+.include "${MASTERDIR}/Makefile"
Index: sysutils/atf-fvp/pkg-descr
===================================================================
--- /dev/null
+++ sysutils/atf-fvp/pkg-descr
@@ -0,0 +1,7 @@
+Arm Trusted Framework for the Arm Fixed Virtual Platform
+
+Trusted Firmware-A (TF-A) provides a reference implementation of secure world
+software for Armv7-A and Armv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3).
+
+WWW: https://github.com/ARM-software/arm-trusted-firmware
Index: sysutils/atf-master/Makefile
===================================================================
--- sysutils/atf-master/Makefile
+++ sysutils/atf-master/Makefile
@@ -19,12 +19,16 @@
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
-ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= bl31
+ATF_TARGET?=	bl31
+ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= HOSTCC=${CC} ${ATF_TARGET}
 
 # Default to the latest release
 ATF_VERSION?=	v2.5
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
+.if defined(FIP)
+PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${FIP:T}
+.endif
 
 DESCR?=		${.CURDIR}/pkg-descr
 
@@ -38,5 +42,8 @@
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
+.if defined(FIP)
+	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
+.endif
 
 .include <bsd.port.mk>