Switch over to mainline ATF (but requires master branch snapshot for …

…now).

Bump pkgrevision.

sysutils/u-boot-pinebook/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/02/20 17:06:23 martin Exp $
+# $NetBSD: Makefile,v 1.12 2019/02/27 06:25:37 martin Exp $
 
 UBOOT_VERSION=		2018.11rc3
 UBOOT_TARGET=		pinebook
@@ -11,18 +11,18 @@ GITHUB_PROJECT=		u-boot-pine64
 GITHUB_TAG=		88eea875b3b82a0e50cbb112e0aea2259dc2e011
 DISTNAME=		u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 EXTRACT_SUFX=		.tar.gz
-PKGREVISION=		1
+PKGREVISION=		2
 
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/u-boot-pinebook/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/u-boot-pinebook/patches
 
 post-extract:
-	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
+	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC}
 
 post-build:
 	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 
-.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
+.include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
 
 CHECK_PORTABILITY_SKIP+=tools/imx_cntr_image.sh