[pkgsrc/trunk]: pkgsrc/sysutils Add buildlink3.mk for sun50iw1p1 ATF and use ...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1000a980e2a6
branches:  trunk
changeset: 375649:1000a980e2a6
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Feb 18 16:25:45 2018 +0000

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

diffstat:

 sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk |  14 ++++++++++++++
 sysutils/u-boot-nanopi-neo-plus2/Makefile              |  10 +++++-----
 sysutils/u-boot-nanopi-neo2/Makefile                   |   7 +++----
 sysutils/u-boot-pine64/Makefile                        |  11 +++++------
 sysutils/u-boot-pinebook/Makefile                      |   5 ++---
 5 files changed, 29 insertions(+), 18 deletions(-)

diffs (117 lines):

diff -r 1b36f9e341dc -r 1000a980e2a6 sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk    Sun Feb 18 16:25:45 2018 +0000
@@ -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 -r 1b36f9e341dc -r 1000a980e2a6 sysutils/u-boot-nanopi-neo-plus2/Makefile
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile Sun Feb 18 16:11:39 2018 +0000
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile Sun Feb 18 16:25:45 2018 +0000
@@ -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 -r 1b36f9e341dc -r 1000a980e2a6 sysutils/u-boot-nanopi-neo2/Makefile
--- a/sysutils/u-boot-nanopi-neo2/Makefile      Sun Feb 18 16:11:39 2018 +0000
+++ b/sysutils/u-boot-nanopi-neo2/Makefile      Sun Feb 18 16:25:45 2018 +0000
@@ -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 @@
 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 -r 1b36f9e341dc -r 1000a980e2a6 sysutils/u-boot-pine64/Makefile
--- a/sysutils/u-boot-pine64/Makefile   Sun Feb 18 16:11:39 2018 +0000
+++ b/sysutils/u-boot-pine64/Makefile   Sun Feb 18 16:25:45 2018 +0000
@@ -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 @@
 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:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot-sunxi-with-spl.bin
 
-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 -r 1b36f9e341dc -r 1000a980e2a6 sysutils/u-boot-pinebook/Makefile
--- a/sysutils/u-boot-pinebook/Makefile Sun Feb 18 16:11:39 2018 +0000
+++ b/sysutils/u-boot-pinebook/Makefile Sun Feb 18 16:25:45 2018 +0000
@@ -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 @@
 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