Thu Sep 7 15:37:21 2017 UTC ()
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.


(jmcneill)
diff -r1.718 -r1.719 pkgsrc/sysutils/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-pine64/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-pine64/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-pine64/PLIST
diff -r1.1 -r0 pkgsrc/sysutils/u-boot-pine64-plus/DESCR
diff -r1.1 -r0 pkgsrc/sysutils/u-boot-pine64-plus/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/u-boot-pine64-plus/PLIST
cvs diff -r1.718 -r1.719 pkgsrc/sysutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/Makefile 2017/09/07 13:13:02 1.718
+++ pkgsrc/sysutils/Makefile 2017/09/07 15:37:21 1.719
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.718 2017/09/07 13:13:02 jun Exp $ 1# $NetBSD: Makefile,v 1.719 2017/09/07 15:37:21 jmcneill Exp $
2# 2#
3 3
4COMMENT= System utilities 4COMMENT= System utilities
5 5
6SUBDIR+= 855resolution 6SUBDIR+= 855resolution
7SUBDIR+= 915resolution 7SUBDIR+= 915resolution
8SUBDIR+= 9base 8SUBDIR+= 9base
9SUBDIR+= WCMCommander 9SUBDIR+= WCMCommander
10SUBDIR+= acpica-utils 10SUBDIR+= acpica-utils
11SUBDIR+= acpidump 11SUBDIR+= acpidump
12SUBDIR+= adtool 12SUBDIR+= adtool
13SUBDIR+= afbinit 13SUBDIR+= afbinit
14SUBDIR+= agedu 14SUBDIR+= agedu
@@ -585,27 +585,27 @@ SUBDIR+= tpb @@ -585,27 +585,27 @@ SUBDIR+= tpb
585SUBDIR+= tphdisk 585SUBDIR+= tphdisk
586SUBDIR+= tree 586SUBDIR+= tree
587SUBDIR+= ts 587SUBDIR+= ts
588#SUBDIR+= u-boot # only contains Makefile fragments 588#SUBDIR+= u-boot # only contains Makefile fragments
589SUBDIR+= u-boot-beagleboard 589SUBDIR+= u-boot-beagleboard
590SUBDIR+= u-boot-beagleboneblack 590SUBDIR+= u-boot-beagleboneblack
591SUBDIR+= u-boot-beaglebonewhite 591SUBDIR+= u-boot-beaglebonewhite
592SUBDIR+= u-boot-chip 592SUBDIR+= u-boot-chip
593SUBDIR+= u-boot-cubieboard4 593SUBDIR+= u-boot-cubieboard4
594SUBDIR+= u-boot-nanopi-neo 594SUBDIR+= u-boot-nanopi-neo
595SUBDIR+= u-boot-orangepi-2 595SUBDIR+= u-boot-orangepi-2
596SUBDIR+= u-boot-orangepi-one 596SUBDIR+= u-boot-orangepi-one
597SUBDIR+= u-boot-orangepi-plus2e 597SUBDIR+= u-boot-orangepi-plus2e
598SUBDIR+= u-boot-pine64-plus 598SUBDIR+= u-boot-pine64
599SUBDIR+= u-boot-pocketchip 599SUBDIR+= u-boot-pocketchip
600SUBDIR+= u-boot-sinovoip-bpi-m3 600SUBDIR+= u-boot-sinovoip-bpi-m3
601SUBDIR+= upower 601SUBDIR+= upower
602SUBDIR+= ups-nut 602SUBDIR+= ups-nut
603SUBDIR+= ups-nut-cgi 603SUBDIR+= ups-nut-cgi
604SUBDIR+= ups-nut-snmp 604SUBDIR+= ups-nut-snmp
605SUBDIR+= ups-nut-usb 605SUBDIR+= ups-nut-usb
606SUBDIR+= usbutil 606SUBDIR+= usbutil
607SUBDIR+= user_cygwin 607SUBDIR+= user_cygwin
608SUBDIR+= user_darwin 608SUBDIR+= user_darwin
609SUBDIR+= user_interix 609SUBDIR+= user_interix
610SUBDIR+= user_irix 610SUBDIR+= user_irix
611SUBDIR+= vbetool 611SUBDIR+= vbetool
File Added: pkgsrc/sysutils/u-boot-pine64/DESCR
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+
File Added: pkgsrc/sysutils/u-boot-pine64/Makefile
# $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"
File Added: pkgsrc/sysutils/u-boot-pine64/PLIST
@comment $NetBSD: PLIST,v 1.1 2017/09/07 15:37:21 jmcneill Exp $
share/u-boot/pine64/u-boot-sunxi-with-spl.bin
File Deleted: pkgsrc/sysutils/u-boot-pine64-plus/Attic/DESCR
File Deleted: pkgsrc/sysutils/u-boot-pine64-plus/Attic/Makefile
File Deleted: pkgsrc/sysutils/u-boot-pine64-plus/Attic/PLIST