Add installboot(8) configurations for Rock64, RockPro64 and Pinebook Pro.

9 files changed, 159 insertions, 9 deletions

diff --git a/sysutils/u-boot-pinebook-pro/Makefile b/sysutils/u-boot-pinebook-pro/Makefile
index b82123b6d81..e6e45984e81 100644
--- a/sysutils/u-boot-pinebook-pro/Makefile
+++ b/sysutils/u-boot-pinebook-pro/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2020/01/14 09:01:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/27 08:02:29 thorpej Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 UBOOT_TARGET=		pinebook-pro
 UBOOT_CONFIG=		pinebook_pro-rk3399_defconfig
 UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
+UBOOT_INSTALLBOOT_PLIST=	installboot.plist
+
 U_BOOT_IMAGE_TYPE=	rk3399
 
 .include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk"
diff --git a/sysutils/u-boot-pinebook-pro/PLIST b/sysutils/u-boot-pinebook-pro/PLIST
index 5e1165b3c87..a9a56056e59 100644
--- a/sysutils/u-boot-pinebook-pro/PLIST
+++ b/sysutils/u-boot-pinebook-pro/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2020/01/14 08:44:03 mrg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/27 08:02:29 thorpej Exp $
 share/u-boot/pinebook-pro/idbloader.img
+share/u-boot/pinebook-pro/installboot.plist
 share/u-boot/pinebook-pro/rksd_loader.img
 share/u-boot/pinebook-pro/rkspi_loader.img
 share/u-boot/pinebook-pro/u-boot.itb
diff --git a/sysutils/u-boot-pinebook-pro/files/installboot.plist b/sysutils/u-boot-pinebook-pro/files/installboot.plist
new file mode 100644
index 00000000000..51d422db2ac
--- /dev/null
+++ b/sysutils/u-boot-pinebook-pro/files/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2020/01/27 08:02:29 thorpej Exp $ -->
+<!--
+  Copyright (c) 2020 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>pine64,pinebook-pro</key>
+	<dict>
+		<key>description</key>
+		<string>Pine64 Pinebook Pro</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>rksd_loader.img</string>
+				<key>image-offset</key>
+				<integer>32768</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index 39068d266ad..54a302b7e87 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2019/09/15 15:50:22 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/27 08:02:30 thorpej Exp $
 
-PKGREVISION=		5
+PKGREVISION=		6
 UBOOT_TARGET=		rock64
 UBOOT_CONFIG=		rock64-rk3328_defconfig
 UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
+UBOOT_INSTALLBOOT_PLIST=	installboot.plist
+
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
 
 U_BOOT_IMAGE_TYPE=	rk3328
diff --git a/sysutils/u-boot-rock64/PLIST b/sysutils/u-boot-rock64/PLIST
index f460b5d9580..2a0cbb02abb 100644
--- a/sysutils/u-boot-rock64/PLIST
+++ b/sysutils/u-boot-rock64/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2019/08/13 21:28:46 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/27 08:02:30 thorpej Exp $
 share/u-boot/rock64/idbloader.img
+share/u-boot/rock64/installboot.plist
 share/u-boot/rock64/rksd_loader.img
 share/u-boot/rock64/rkspi_loader.img
 share/u-boot/rock64/u-boot.itb
diff --git a/sysutils/u-boot-rock64/files/installboot.plist b/sysutils/u-boot-rock64/files/installboot.plist
new file mode 100644
index 00000000000..58e0fd61998
--- /dev/null
+++ b/sysutils/u-boot-rock64/files/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2020/01/27 08:02:30 thorpej Exp $ -->
+<!--
+  Copyright (c) 2020 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>pine64,rock64</key>
+	<dict>
+		<key>description</key>
+		<string>Pine64 Rock64</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>rksd_loader.img</string>
+				<key>image-offset</key>
+				<integer>32768</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 86fdca12cce..d55fe9e0735 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2019/09/15 20:13:31 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/27 08:02:30 thorpej Exp $
 
-PKGREVISION=		6
+PKGREVISION=		7
 UBOOT_TARGET=		rockpro64
 UBOOT_CONFIG=		rockpro64-rk3399_defconfig
 UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
+UBOOT_INSTALLBOOT_PLIST=	installboot.plist
+
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo
 
 U_BOOT_IMAGE_TYPE=	rk3399
diff --git a/sysutils/u-boot-rockpro64/PLIST b/sysutils/u-boot-rockpro64/PLIST
index d33218ca1f9..c1eae62df2a 100644
--- a/sysutils/u-boot-rockpro64/PLIST
+++ b/sysutils/u-boot-rockpro64/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2019/08/13 21:28:47 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/27 08:02:30 thorpej Exp $
 share/u-boot/rockpro64/idbloader.img
+share/u-boot/rockpro64/installboot.plist
 share/u-boot/rockpro64/rksd_loader.img
 share/u-boot/rockpro64/rkspi_loader.img
 share/u-boot/rockpro64/u-boot.itb
diff --git a/sysutils/u-boot-rockpro64/files/installboot.plist b/sysutils/u-boot-rockpro64/files/installboot.plist
new file mode 100644
index 00000000000..c6b92476fbb
--- /dev/null
+++ b/sysutils/u-boot-rockpro64/files/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2020/01/27 08:02:30 thorpej Exp $ -->
+<!--
+  Copyright (c) 2020 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>pine64,rockpro64</key>
+	<dict>
+		<key>description</key>
+		<string>Pine64 RockPro64</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>rksd_loader.img</string>
+				<key>image-offset</key>
+				<integer>32768</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>