Wed May 8 05:06:48 2019 UTC ()
Add installboot(8) overlay support.


(thorpej)
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-r2/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-bananapi-r2/Makefile 2019/04/25 13:22:12 1.3
+++ pkgsrc/sysutils/u-boot-bananapi-r2/Makefile 2019/05/08 05:06:48 1.4
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.3 2019/04/25 13:22:12 thorpej Exp $ 1# $NetBSD: Makefile,v 1.4 2019/05/08 05:06:48 thorpej Exp $
2 2
3UBOOT_TARGET= bananapi-r2 3UBOOT_TARGET= bananapi-r2
4UBOOT_CONFIG= mt7623n_bpir2_defconfig 4UBOOT_CONFIG= mt7623n_bpir2_defconfig
5UBOOT_BIN= bpi-r2-sdmmc.img u-boot.bin 5UBOOT_BIN= bpi-r2-sdmmc.img u-boot.bin
6 6
7PKGREVISION= 2 7UBOOT_INSTALLBOOT_PLIST=installboot.plist
 8
 9PKGREVISION= 3
8 10
9UBOOT_VERSION= 2019.04-rc4 11UBOOT_VERSION= 2019.04-rc4
10 12
11DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/distinfo
12PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/patches 14PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/patches
13DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
14 16
15# SDMMC_BOOT-signature 17# SDMMC_BOOT-signature
16SDMMC_BOOT_IMG= BPI-R2-HEAD440-0k.img 18SDMMC_BOOT_IMG= BPI-R2-HEAD440-0k.img
17DISTFILES+= ${SDMMC_BOOT_IMG} 19DISTFILES+= ${SDMMC_BOOT_IMG}
18UBOOT_BIN+= ${SDMMC_BOOT_IMG} 20UBOOT_BIN+= ${SDMMC_BOOT_IMG}
19SITES.${SDMMC_BOOT_IMG}=${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/} 21SITES.${SDMMC_BOOT_IMG}=${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/}
20 22
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-r2/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-bananapi-r2/PLIST 2019/04/25 13:22:12 1.3
+++ pkgsrc/sysutils/u-boot-bananapi-r2/PLIST 2019/05/08 05:06:48 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1@comment $NetBSD: PLIST,v 1.3 2019/04/25 13:22:12 thorpej Exp $ 1@comment $NetBSD: PLIST,v 1.4 2019/05/08 05:06:48 thorpej Exp $
2share/u-boot/bananapi-r2/BPI-R2-HEAD440-0k.img 2share/u-boot/bananapi-r2/BPI-R2-HEAD440-0k.img
3share/u-boot/bananapi-r2/BPI-R2-HEAD1-512b.img 3share/u-boot/bananapi-r2/BPI-R2-HEAD1-512b.img
4share/u-boot/bananapi-r2/bpi-r2-sdmmc.img 4share/u-boot/bananapi-r2/bpi-r2-sdmmc.img
 5share/u-boot/bananapi-r2/installboot.plist
5share/u-boot/bananapi-r2/preloader_iotg7623Np1_sd_1600M.bin 6share/u-boot/bananapi-r2/preloader_iotg7623Np1_sd_1600M.bin
6share/u-boot/bananapi-r2/u-boot.bin 7share/u-boot/bananapi-r2/u-boot.bin
File Added: pkgsrc/sysutils/u-boot-bananapi-r2/files/installboot.plist
<!-- $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>