git: 108bd05cd72b - main - sysutils/atf-fvp: Add a new Arm TF-A for the Arm FVP

[Andrew Turner]

The branch main has been updated by andrew (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=108bd05cd72b450b9eac8734dc490f6b7274f15e

commit 108bd05cd72b450b9eac8734dc490f6b7274f15e
Author:     Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2021-07-02 10:35:50 +0000
Commit:     Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2021-08-04 19:07:26 +0000

    sysutils/atf-fvp: Add a new Arm TF-A for the Arm FVP
    
    This is used on the Arm Models (simulators)
    
    Approved by:    manu
    Sponsored by:   The FreeBSD Foundation
---
 sysutils/Makefile            |  1 +
 sysutils/atf-fvp/Makefile    | 10 ++++++++++
 sysutils/atf-fvp/pkg-descr   |  7 +++++++
 sysutils/atf-master/Makefile |  9 ++++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 26bed7a16f79..bf03d452a038 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -61,6 +61,7 @@
     SUBDIR += asmem
     SUBDIR += asmon
     SUBDIR += asusoled
+    SUBDIR += atf-fvp
     SUBDIR += atf-master
     SUBDIR += atf-rk3328
     SUBDIR += atf-rk3399
diff --git a/sysutils/atf-fvp/Makefile b/sysutils/atf-fvp/Makefile
new file mode 100644
index 000000000000..0ce0eea09296
--- /dev/null
+++ b/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 at fvp
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/atf-fvp/pkg-descr b/sysutils/atf-fvp/pkg-descr
new file mode 100644
index 000000000000..9a867263fabb
--- /dev/null
+++ b/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
diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
index d978efb6885b..7270fe6ebe6e 100644
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -19,12 +19,16 @@ GH_TAGNAME=	${ATF_VERSION}
 
 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 @@ IGNORE=		is a metaport; there is nothing to build
 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>