Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_155729200827000"
MIME-Version: 1.0
Date: Wed, 8 May 2019 05:06:48 +0000
From: "Jason R Thorpe" <thorpej@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/u-boot-bananapi-r2
To: pkgsrc-changes@NetBSD.org
Reply-To: thorpej@netbsd.org
Message-Id: <20190508050648.D4774FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_155729200827000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	thorpej
Date:		Wed May  8 05:06:48 UTC 2019

Modified Files:
	pkgsrc/sysutils/u-boot-bananapi-r2: Makefile PLIST
Added Files:
	pkgsrc/sysutils/u-boot-bananapi-r2/files: installboot.plist

Log Message:
Add installboot(8) overlay support.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile \
    pkgsrc/sysutils/u-boot-bananapi-r2/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist

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


--_----------=_155729200827000
Content-Disposition: inline
Content-Length: 4067
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/u-boot-bananapi-r2/Makefile
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.3 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.4
--- pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.3	Thu Apr 25 13:22:12 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/Makefile	Wed May  8 05:06:48 2019
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 13:22:12 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/08 05:06:48 thorpej Exp $
 
 UBOOT_TARGET=		bananapi-r2
 UBOOT_CONFIG=		mt7623n_bpir2_defconfig
 UBOOT_BIN=		bpi-r2-sdmmc.img u-boot.bin
 
-PKGREVISION=		2
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		3
 
 UBOOT_VERSION=		2019.04-rc4
 
Index: pkgsrc/sysutils/u-boot-bananapi-r2/PLIST
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.3 pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.4
--- pkgsrc/sysutils/u-boot-bananapi-r2/PLIST:1.3	Thu Apr 25 13:22:12 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/PLIST	Wed May  8 05:06:48 2019
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2019/04/25 13:22:12 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/05/08 05:06:48 thorpej Exp $
 share/u-boot/bananapi-r2/BPI-R2-HEAD440-0k.img
 share/u-boot/bananapi-r2/BPI-R2-HEAD1-512b.img
 share/u-boot/bananapi-r2/bpi-r2-sdmmc.img
+share/u-boot/bananapi-r2/installboot.plist
 share/u-boot/bananapi-r2/preloader_iotg7623Np1_sd_1600M.bin
 share/u-boot/bananapi-r2/u-boot.bin

Added files:

Index: pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist
diff -u /dev/null pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist:1.1
--- /dev/null	Wed May  8 05:06:48 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist	Wed May  8 05:06:48 2019
@@ -0,0 +1,65 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:06:48 thorpej Exp $ -->
+<!--
+  Copyright (c) 2019 The NetBSD Foundation, Inc.
+  All rights reserved.
+ 
+  This code is derived from software contributed to The NetBSD Foundation
+  by Jason R. Thorpe.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+-->
+<plist>
+<dict>
+	<key>bananapi,bpi-r2</key>
+	<dict>
+		<key>description</key>
+		<string>Bananapi BPI-R2</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>BPI-R2-HEAD440-0k.img</string>
+				<key>preserve</key>
+				<true/>
+			</dict>
+			<dict>
+				<key>file-name</key>
+				<string>BPI-R2-HEAD1-512b.img</string>
+				<key>image-offset</key>
+				<integer>512</integer>
+			</dict>
+			<dict>
+				<key>file-name</key>
+				<string>preloader_iotg7623Np1_sd_1600M.bin</string>
+				<key>image-offset</key>
+				<integer>2048</integer>
+			</dict>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot.bin</string>
+				<key>image-offset</key>
+				<integer>327680</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>


--_----------=_155729200827000--