CVS commit: pkgsrc/sysutils

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Thu Sep  7 15:37:21 UTC 2017

Modified Files:
        pkgsrc/sysutils: Makefile
Added Files:
        pkgsrc/sysutils/u-boot-pine64: DESCR Makefile PLIST
Removed Files:
        pkgsrc/sysutils/u-boot-pine64-plus: DESCR Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.718 -r1.719 pkgsrc/sysutils/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-pine64/DESCR \
    pkgsrc/sysutils/u-boot-pine64/Makefile \
    pkgsrc/sysutils/u-boot-pine64/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/u-boot-pine64-plus/DESCR \
    pkgsrc/sysutils/u-boot-pine64-plus/Makefile \
    pkgsrc/sysutils/u-boot-pine64-plus/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.718 pkgsrc/sysutils/Makefile:1.719
--- pkgsrc/sysutils/Makefile:1.718      Thu Sep  7 13:13:02 2017
+++ pkgsrc/sysutils/Makefile    Thu Sep  7 15:37:21 2017
@@ -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-nanopi-neo
 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

Added files:

Index: pkgsrc/sysutils/u-boot-pine64/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-pine64/DESCR:1.1
--- /dev/null   Thu Sep  7 15:37:21 2017
+++ pkgsrc/sysutils/u-boot-pine64/DESCR Thu Sep  7 15:37:21 2017
@@ -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+
Index: pkgsrc/sysutils/u-boot-pine64/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-pine64/Makefile:1.1
--- /dev/null   Thu Sep  7 15:37:21 2017
+++ pkgsrc/sysutils/u-boot-pine64/Makefile      Thu Sep  7 15:37:21 2017
@@ -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"
Index: pkgsrc/sysutils/u-boot-pine64/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-pine64/PLIST:1.1
--- /dev/null   Thu Sep  7 15:37:21 2017
+++ pkgsrc/sysutils/u-boot-pine64/PLIST Thu Sep  7 15:37:21 2017
@@ -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