diff -urN atf-master.orig/Makefile atf-master/Makefile --- atf-master.orig/Makefile 2021-11-01 19:00:58.059854000 +0100 +++ atf-master/Makefile 2021-11-01 18:56:28.353187000 +0100 @@ -8,7 +8,11 @@ LICENSE= BSD3CLAUSE +.if ${ATF_ARCH} == arm +BUILD_DEPENDS+= arm-none-eabi-gcc:devel/arm-none-eabi-gcc +.else BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc +.endif USES= gmake @@ -18,9 +22,15 @@ GH_TAGNAME= ${ATF_VERSION} SSP_UNSAFE= yes + +.if ${ATF_ARCH} == arm +MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-" +ALL_TARGET= ARCH="aarch32" PLAT=${PLAT} V=1 AARCH32_SP="sp_min" CFLAGS= bl32 +.else MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" ATF_TARGET?= bl31 ALL_TARGET= ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= HOSTCC=${CC} ${ATF_TARGET} +.endif # Default to the latest release ATF_VERSION?= v2.5 @@ -29,6 +39,9 @@ .if defined(FIP) PLIST_FILES+= ${PREFIX}/share/${PORTNAME}-${PLAT}/${FIP:T} .endif +.if ${PLAT} == rk3288 +PLIST_FILES?= ${PREFIX}/share/${PORTNAME}-${PLAT}/${BL32:T} +.endif DESCR?= ${.CURDIR}/pkg-descr @@ -41,7 +54,13 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ - ${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ + +.if ${PLAT} == rk3288 + ${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL32} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ +.else + ${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ +.endif + .if defined(FIP) ${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ .endif