Add buildlink3.mk for sun50iw1p1 ATF and use it. Bump pkg revision where

necessary.

5 files changed, 28 insertions, 17 deletions

diff --git a/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk b/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
new file mode 100644
index 00000000000..33b85ce52a5
--- /dev/null
+++ b/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/02/18 16:25:45 jmcneill Exp $
+
+BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50iw1p1?=	build
+
+BUILDLINK_TREE+=	arm-trusted-firmware-sun50iw1p1
+
+.if !defined(ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK)
+ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50iw1p1+=	arm-trusted-firmware-sun50iw1p1>=20180111
+BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50iw1p1?=	../../sysutils/arm-trusted-firmware-sun50iw1p1
+.endif	# ARM_TRUSTED_FIRMWARE_SUN50IW1P1_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-arm-trusted-firmware-sun50iw1p1
diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile
index 8b516cc075d..bb1725df35f 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
-PKG_DEFAULT_OPTIONS+=	el1
+#PKG_DEFAULT_OPTIONS+=	el1
+PKG_DEFAULT_OPTIONS+=	debug
 
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 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/u-boot/u-boot-arm64.mk"
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index 17cd62e0dc3..503b95e5d48 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
@@ -12,9 +12,8 @@ PKG_DEFAULT_OPTIONS+=	el1
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 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/u-boot/u-boot-arm64.mk"
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index dbb6c4b445d..c8c58c35530 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:21 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
@@ -12,9 +12,8 @@ PKG_DEFAULT_OPTIONS+=	el1
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 post-build:
-	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot-sunxi-with-spl.bin
 
+.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index 228a2a0488a..a3feeb931fa 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/18 16:25:45 jmcneill Exp $
 
 UBOOT_VERSION=		2018.01
 UBOOT_TARGET=		pinebook
@@ -18,11 +18,10 @@ PKG_DEFAULT_OPTIONS+=	el1
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1>=20180111:../../sysutils/arm-trusted-firmware-sun50iw1p1
-
 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/u-boot/u-boot-arm64.mk"
 
 # Override U-Boot defaults