Sun Feb 18 16:25:45 2018 UTC ()
Add buildlink3.mk for sun50iw1p1 ATF and use it. Bump pkg revision where
necessary.


(jmcneill)
diff -r0 -r1.1 pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-pine64/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pinebook/Makefile
File Added: pkgsrc/sysutils/arm-trusted-firmware-sun50iw1p1/Attic/buildlink3.mk
# $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
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2018/01/10 00:55:27 1.1
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2018/02/18 16:25:45 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $ 1# $NetBSD: Makefile,v 1.2 2018/02/18 16:25:45 jmcneill Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4 4
5UBOOT_TARGET= nanopi-neo-plus2 5UBOOT_TARGET= nanopi-neo-plus2
6UBOOT_CONFIG= nanopi_neo_plus2_defconfig 6UBOOT_CONFIG= nanopi_neo_plus2_defconfig
7UBOOT_BIN= u-boot-sunxi-with-spl.bin 7UBOOT_BIN= u-boot-sunxi-with-spl.bin
8 8
9# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
10PKG_DEFAULT_OPTIONS+= el1 10#PKG_DEFAULT_OPTIONS+= el1
 11PKG_DEFAULT_OPTIONS+= debug
11 12
12post-extract: 13post-extract:
13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 14 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
14 15
15BUILD_DEPENDS+= arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1 
16 
17post-build: 16post-build:
18 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 17 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
19 18
 19.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
20.include "../../sysutils/u-boot/u-boot-arm64.mk" 20.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2017/12/18 23:31:20 1.2
+++ pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2018/02/18 16:25:45 1.3
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:20 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4 4
5UBOOT_TARGET= nanopi-neo2 5UBOOT_TARGET= nanopi-neo2
6UBOOT_CONFIG= nanopi_neo2_defconfig 6UBOOT_CONFIG= nanopi_neo2_defconfig
7UBOOT_BIN= u-boot-sunxi-with-spl.bin 7UBOOT_BIN= u-boot-sunxi-with-spl.bin
8 8
9# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
10PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
11 11
12post-extract: 12post-extract:
13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
14 14
15BUILD_DEPENDS+= arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1 
16 
17post-build: 15post-build:
18 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
19 17
 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
20.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-pine64/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pine64/Makefile 2017/12/18 23:31:21 1.2
+++ pkgsrc/sysutils/u-boot-pine64/Makefile 2018/02/18 16:25:45 1.3
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.2 2017/12/18 23:31:21 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.3 2018/02/18 16:25:45 jmcneill Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 3
4 4
5UBOOT_TARGET= pine64 5UBOOT_TARGET= pine64
6UBOOT_CONFIG= pine64_plus_defconfig 6UBOOT_CONFIG= pine64_plus_defconfig
7UBOOT_BIN= u-boot-sunxi-with-spl.bin 7UBOOT_BIN= u-boot-sunxi-with-spl.bin
8 8
9# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
10PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
11 11
12post-extract: 12post-extract:
13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
14 14
15BUILD_DEPENDS+= arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1 
16 
17post-build: 15post-build:
18 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot-sunxi-with-spl.bin
19 17
 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
20.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pinebook/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pinebook/Makefile 2018/02/18 12:27:20 1.3
+++ pkgsrc/sysutils/u-boot-pinebook/Makefile 2018/02/18 16:25:45 1.4
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1# $NetBSD: Makefile,v 1.3 2018/02/18 12:27:20 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/02/18 16:25:45 jmcneill Exp $
2 2
3UBOOT_VERSION= 2018.01 3UBOOT_VERSION= 2018.01
4UBOOT_TARGET= pinebook 4UBOOT_TARGET= pinebook
5UBOOT_CONFIG= pinebook_defconfig 5UBOOT_CONFIG= pinebook_defconfig
6UBOOT_BIN= u-boot-sunxi-with-spl.bin 6UBOOT_BIN= u-boot-sunxi-with-spl.bin
7 7
8# Use anarsoul's fork of mainline U-Boot with Pinebook support patched in 8# Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
9MASTER_SITES= ${MASTER_SITE_GITHUB:=anarsoul/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=anarsoul/}
10GITHUB_PROJECT= u-boot-pine64 10GITHUB_PROJECT= u-boot-pine64
11GITHUB_TAG= 98b74f94efc0bfa40ff78785f99a8f0a1fb0110a 11GITHUB_TAG= 98b74f94efc0bfa40ff78785f99a8f0a1fb0110a
12DISTNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION} 12DISTNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
13EXTRACT_SUFX= .tar.gz 13EXTRACT_SUFX= .tar.gz
14 14
15# Switch to EL1 before booting kernel (required for 32-bit support) 15# Switch to EL1 before booting kernel (required for 32-bit support)
16PKG_DEFAULT_OPTIONS+= el1 16PKG_DEFAULT_OPTIONS+= el1
17 17
18post-extract: 18post-extract:
19 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 19 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
20 20
21BUILD_DEPENDS+= arm-trusted-firmware-sun50iw1p1>=20180111:../../sysutils/arm-trusted-firmware-sun50iw1p1 
22 
23post-build: 21post-build:
24 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 22 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
25 23
 24.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
26.include "../../sysutils/u-boot/u-boot-arm64.mk" 25.include "../../sysutils/u-boot/u-boot-arm64.mk"
27 26
28# Override U-Boot defaults 27# Override U-Boot defaults
29DISTINFO_FILE= ${.CURDIR}/distinfo 28DISTINFO_FILE= ${.CURDIR}/distinfo
30PATCHDIR= ${.CURDIR}/patches 29PATCHDIR= ${.CURDIR}/patches