[pkgsrc/trunk]: pkgsrc/sysutils Rename u-boot-pine64-plus to u-boot-pine64. T...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bf386a91145
branches:  trunk
changeset: 367834:8bf386a91145
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Thu Sep 07 15:37:21 2017 +0000

description:
Rename u-boot-pine64-plus to u-boot-pine64. This package includes support
for both board variants. While here, enable el1 package option by default
so we can boot 32-bit kernels.

diffstat:

 sysutils/Makefile                    |   4 ++--
 sysutils/u-boot-pine64-plus/DESCR    |   5 -----
 sysutils/u-boot-pine64-plus/Makefile |  15 ---------------
 sysutils/u-boot-pine64-plus/PLIST    |   2 --
 sysutils/u-boot-pine64/DESCR         |   5 +++++
 sysutils/u-boot-pine64/Makefile      |  18 ++++++++++++++++++
 sysutils/u-boot-pine64/PLIST         |   2 ++
 7 files changed, 27 insertions(+), 24 deletions(-)

diffs (89 lines):

diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/Makefile
--- a/sysutils/Makefile Thu Sep 07 15:31:53 2017 +0000
+++ b/sysutils/Makefile Thu Sep 07 15:37:21 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.718 2017/09/07 13:13:02 jun Exp $
+# $NetBSD: Makefile,v 1.719 2017/09/07 15:37:21 jmcneill Exp $
 #
 
 COMMENT=       System utilities
@@ -595,7 +595,7 @@
 SUBDIR+=       u-boot-orangepi-2
 SUBDIR+=       u-boot-orangepi-one
 SUBDIR+=       u-boot-orangepi-plus2e
-SUBDIR+=       u-boot-pine64-plus
+SUBDIR+=       u-boot-pine64
 SUBDIR+=       u-boot-pocketchip
 SUBDIR+=       u-boot-sinovoip-bpi-m3
 SUBDIR+=       upower
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64-plus/DESCR
--- a/sysutils/u-boot-pine64-plus/DESCR Thu Sep 07 15:31:53 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
-several other processors, which can be installed in a boot ROM and used to
-initialize and test the hardware or to download and run application code.
-
-This package provides U-Boot for the Pine64
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64-plus/Makefile
--- a/sysutils/u-boot-pine64-plus/Makefile      Thu Sep 07 15:31:53 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2017/09/01 21:04:09 jmcneill Exp $
-
-UBOOT_TARGET=          pine64-plus
-UBOOT_CONFIG=          pine64_plus_defconfig
-UBOOT_BIN=             u-boot-sunxi-with-spl.bin
-
-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/u-boot/u-boot-arm64.mk"
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64-plus/PLIST
--- a/sysutils/u-boot-pine64-plus/PLIST Thu Sep 07 15:31:53 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/01 21:04:09 jmcneill Exp $
-share/u-boot/pine64-plus/u-boot-sunxi-with-spl.bin
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-pine64/DESCR      Thu Sep 07 15:37:21 2017 +0000
@@ -0,0 +1,5 @@
+U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
+several other processors, which can be installed in a boot ROM and used to
+initialize and test the hardware or to download and run application code.
+
+This package provides U-Boot for the Pine64 and Pine64+
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-pine64/Makefile   Thu Sep 07 15:37:21 2017 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2017/09/07 15:37:21 jmcneill Exp $
+
+UBOOT_TARGET=          pine64
+UBOOT_CONFIG=          pine64_plus_defconfig
+UBOOT_BIN=             u-boot-sunxi-with-spl.bin
+
+# Switch to EL1 before booting kernel (required for 32-bit support)
+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/u-boot/u-boot-arm64.mk"
diff -r b2f1ce6faa2e -r 8bf386a91145 sysutils/u-boot-pine64/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-pine64/PLIST      Thu Sep 07 15:37:21 2017 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2017/09/07 15:37:21 jmcneill Exp $
+share/u-boot/pine64/u-boot-sunxi-with-spl.bin