Add installboot(8) overlays for the sunxi u-boot packages.

72 files changed, 1288 insertions, 72 deletions

diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile
index a0d94c0b874..3f947de9e41 100644
--- a/sysutils/u-boot-a10-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:27 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		a10-olinuxino-lime
 UBOOT_CONFIG=		A10-OLinuXino-Lime_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-a10-olinuxino-lime/PLIST b/sysutils/u-boot-a10-olinuxino-lime/PLIST
index 1ab4c53184d..4c8ac8c8634 100644
--- a/sysutils/u-boot-a10-olinuxino-lime/PLIST
+++ b/sysutils/u-boot-a10-olinuxino-lime/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/08 13:18:58 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/a10-olinuxino-lime/installboot.plist
 share/u-boot/a10-olinuxino-lime/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-a10-olinuxino-lime/installboot.plist b/sysutils/u-boot-a10-olinuxino-lime/installboot.plist
new file mode 100644
index 00000000000..37684fc3914
--- /dev/null
+++ b/sysutils/u-boot-a10-olinuxino-lime/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>olimex,a10-olinuxino-lime</key>
+	<dict>
+		<key>description</key>
+		<string>Olimex A10-OLinuXino-LIME</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-bananapi-m3/Makefile b/sysutils/u-boot-bananapi-m3/Makefile
index 8a66b456d38..293dc7c7dee 100644
--- a/sysutils/u-boot-bananapi-m3/Makefile
+++ b/sysutils/u-boot-bananapi-m3/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		bananapi-m3
 UBOOT_CONFIG=		Sinovoip_BPI_M3_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-bananapi-m3/PLIST b/sysutils/u-boot-bananapi-m3/PLIST
index 2ad4ccdd629..e749bdb9da5 100644
--- a/sysutils/u-boot-bananapi-m3/PLIST
+++ b/sysutils/u-boot-bananapi-m3/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/11/18 18:38:48 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/bananapi-m3/installboot.plist
 share/u-boot/bananapi-m3/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-bananapi-m3/installboot.plist b/sysutils/u-boot-bananapi-m3/installboot.plist
new file mode 100644
index 00000000000..15a0c0f5b0c
--- /dev/null
+++ b/sysutils/u-boot-bananapi-m3/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>sinovoip,bpi-m3</key>
+	<dict>
+		<key>description</key>
+		<string>Banana Pi BPI-M3</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 5bc5f92625f..b2ce27d9b90 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		bananapi
 UBOOT_CONFIG=		Bananapi_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-bananapi/PLIST b/sysutils/u-boot-bananapi/PLIST
index b012e3faf5e..0f81ef1041f 100644
--- a/sysutils/u-boot-bananapi/PLIST
+++ b/sysutils/u-boot-bananapi/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/07 13:58:52 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/bananapi/installboot.plist
 share/u-boot/bananapi/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-bananapi/installboot.plist b/sysutils/u-boot-bananapi/installboot.plist
new file mode 100644
index 00000000000..b810bc707b3
--- /dev/null
+++ b/sysutils/u-boot-bananapi/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>lemaker,bananapi</key>
+	<dict>
+		<key>description</key>
+		<string>LeMaker Banana Pi</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-chip-pro/Makefile b/sysutils/u-boot-chip-pro/Makefile
index e20de750004..ff0b20e7822 100644
--- a/sysutils/u-boot-chip-pro/Makefile
+++ b/sysutils/u-boot-chip-pro/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		chip-pro
 UBOOT_CONFIG=		CHIP_pro_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-chip-pro/PLIST b/sysutils/u-boot-chip-pro/PLIST
index 22533aec0f6..ca5763ca3a6 100644
--- a/sysutils/u-boot-chip-pro/PLIST
+++ b/sysutils/u-boot-chip-pro/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/11/06 22:13:36 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/chip-pro/installboot.plist
 share/u-boot/chip-pro/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-chip-pro/installboot.plist b/sysutils/u-boot-chip-pro/installboot.plist
new file mode 100644
index 00000000000..8a4b9225bf9
--- /dev/null
+++ b/sysutils/u-boot-chip-pro/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>nextthing,chip-pro</key>
+	<dict>
+		<key>description</key>
+		<string>NextThing C.H.I.P. Pro</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index 6ad630edb1a..fc50a5356d6 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		chip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-chip/PLIST b/sysutils/u-boot-chip/PLIST
index 5f935bb75f7..75c381eb8ba 100644
--- a/sysutils/u-boot-chip/PLIST
+++ b/sysutils/u-boot-chip/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/23 11:58:59 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/chip/installboot.plist
 share/u-boot/chip/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-chip/installboot.plist b/sysutils/u-boot-chip/installboot.plist
new file mode 100644
index 00000000000..2820cf4c57a
--- /dev/null
+++ b/sysutils/u-boot-chip/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>nextthing,chip</key>
+	<dict>
+		<key>description</key>
+		<string>NextThing C.H.I.P.</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index d95f19c6797..2e0ba91b173 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		cubieboard2
 UBOOT_CONFIG=		Cubieboard2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard2/PLIST b/sysutils/u-boot-cubieboard2/PLIST
index f0e709e640a..ff2d36b9453 100644
--- a/sysutils/u-boot-cubieboard2/PLIST
+++ b/sysutils/u-boot-cubieboard2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/06 19:24:08 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/cubieboard2/installboot.plist
 share/u-boot/cubieboard2/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-cubieboard2/installboot.plist b/sysutils/u-boot-cubieboard2/installboot.plist
new file mode 100644
index 00000000000..4d39e9e313d
--- /dev/null
+++ b/sysutils/u-boot-cubieboard2/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>cubietech,cubieboard2</key>
+	<dict>
+		<key>description</key>
+		<string>Cubietech Cubieboard2</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile
index c16296e5c9e..53486b133dd 100644
--- a/sysutils/u-boot-cubieboard4/Makefile
+++ b/sysutils/u-boot-cubieboard4/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		cubieboard4
 UBOOT_CONFIG=		Cubieboard4_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard4/PLIST b/sysutils/u-boot-cubieboard4/PLIST
index b9bde157b2e..1a4325a1d6c 100644
--- a/sysutils/u-boot-cubieboard4/PLIST
+++ b/sysutils/u-boot-cubieboard4/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/04 15:04:33 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/cubieboard4/installboot.plist
 share/u-boot/cubieboard4/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-cubieboard4/installboot.plist b/sysutils/u-boot-cubieboard4/installboot.plist
new file mode 100644
index 00000000000..b5bd69ab563
--- /dev/null
+++ b/sysutils/u-boot-cubieboard4/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>cubietech,a80-cubieboard4</key>
+	<dict>
+		<key>description</key>
+		<string>Cubietech Cubieboard4</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-cubietruck-plus/Makefile b/sysutils/u-boot-cubietruck-plus/Makefile
index 4fb7318335c..9f2ca45f49f 100644
--- a/sysutils/u-boot-cubietruck-plus/Makefile
+++ b/sysutils/u-boot-cubietruck-plus/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2019/05/04 05:31:01 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/07 14:06:23 thorpej Exp $
 
 UBOOT_TARGET=		cubietruck-plus
 UBOOT_CONFIG=		Cubietruck_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubietruck-plus/PLIST b/sysutils/u-boot-cubietruck-plus/PLIST
index 5d57c745e02..3d542bee56b 100644
--- a/sysutils/u-boot-cubietruck-plus/PLIST
+++ b/sysutils/u-boot-cubietruck-plus/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2019/05/04 05:31:01 mrg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/07 14:06:23 thorpej Exp $
+share/u-boot/cubietruck-plus/installboot.plist
 share/u-boot/cubietruck-plus/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-cubietruck-plus/installboot.plist b/sysutils/u-boot-cubietruck-plus/installboot.plist
new file mode 100644
index 00000000000..327857aa243
--- /dev/null
+++ b/sysutils/u-boot-cubietruck-plus/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:23 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>cubietech,cubietruck-plus</key>
+	<dict>
+		<key>description</key>
+		<string>Cubietech Cubietruck Plus</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile
index 4dd9dde2783..b17b3b701d5 100644
--- a/sysutils/u-boot-cubietruck/Makefile
+++ b/sysutils/u-boot-cubietruck/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		cubietruck
 UBOOT_CONFIG=		Cubietruck_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubietruck/PLIST b/sysutils/u-boot-cubietruck/PLIST
index 6ac43bda826..933057b3407 100644
--- a/sysutils/u-boot-cubietruck/PLIST
+++ b/sysutils/u-boot-cubietruck/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/08 13:07:54 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/cubietruck/installboot.plist
 share/u-boot/cubietruck/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-cubietruck/installboot.plist b/sysutils/u-boot-cubietruck/installboot.plist
new file mode 100644
index 00000000000..74602c72711
--- /dev/null
+++ b/sysutils/u-boot-cubietruck/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>cubietech,cubietruck</key>
+	<dict>
+		<key>description</key>
+		<string>Cubietech Cubietruck</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-hummingbird-a31/Makefile b/sysutils/u-boot-hummingbird-a31/Makefile
index fbfe783558f..a1de5b18fa7 100644
--- a/sysutils/u-boot-hummingbird-a31/Makefile
+++ b/sysutils/u-boot-hummingbird-a31/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		hummingbird-a31
 UBOOT_CONFIG=		Hummingbird_A31_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-hummingbird-a31/PLIST b/sysutils/u-boot-hummingbird-a31/PLIST
index 103c1baff0a..69ff0a225d8 100644
--- a/sysutils/u-boot-hummingbird-a31/PLIST
+++ b/sysutils/u-boot-hummingbird-a31/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/07 19:47:56 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/hummingbird-a31/installboot.plist
 share/u-boot/hummingbird-a31/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-hummingbird-a31/installboot.plist b/sysutils/u-boot-hummingbird-a31/installboot.plist
new file mode 100644
index 00000000000..7bfe03c9e7d
--- /dev/null
+++ b/sysutils/u-boot-hummingbird-a31/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>merrii,a31-hummingbird</key>
+	<dict>
+		<key>description</key>
+		<string>Merrii A31 Hummingbird</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-nanopi-m1/Makefile b/sysutils/u-boot-nanopi-m1/Makefile
index 7e037bd0766..aedc68a50c3 100644
--- a/sysutils/u-boot-nanopi-m1/Makefile
+++ b/sysutils/u-boot-nanopi-m1/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		nanopi-m1
 UBOOT_CONFIG=		nanopi_m1_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-nanopi-m1/PLIST b/sysutils/u-boot-nanopi-m1/PLIST
index 048c5a7c83e..448c67e73d4 100644
--- a/sysutils/u-boot-nanopi-m1/PLIST
+++ b/sysutils/u-boot-nanopi-m1/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/12/21 11:46:47 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/nanopi-m1/installboot.plist
 share/u-boot/nanopi-m1/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-nanopi-m1/installboot.plist b/sysutils/u-boot-nanopi-m1/installboot.plist
new file mode 100644
index 00000000000..83891eece33
--- /dev/null
+++ b/sysutils/u-boot-nanopi-m1/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>friendlyarm,nanopi-m1</key>
+	<dict>
+		<key>description</key>
+		<string>FriendlyArm NanoPi M1</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile
index b707f2f1fba..9b552d717dd 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		4
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		5
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 #PKG_DEFAULT_OPTIONS+=	el1
diff --git a/sysutils/u-boot-nanopi-neo-plus2/PLIST b/sysutils/u-boot-nanopi-neo-plus2/PLIST
index d9bb31436a0..4c11a75cf10 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/PLIST
+++ b/sysutils/u-boot-nanopi-neo-plus2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/nanopi-neo-plus2/installboot.plist
 share/u-boot/nanopi-neo-plus2/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-nanopi-neo-plus2/installboot.plist b/sysutils/u-boot-nanopi-neo-plus2/installboot.plist
new file mode 100644
index 00000000000..981ec98f475
--- /dev/null
+++ b/sysutils/u-boot-nanopi-neo-plus2/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>friendlyarm,nanopi-neo-plus2</key>
+	<dict>
+		<key>description</key>
+		<string>FriendlyARM NanoPi NEO Plus2</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index 068ea41dfc9..0bec4af0535 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		nanopi-neo
 UBOOT_CONFIG=		nanopi_neo_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-nanopi-neo/PLIST b/sysutils/u-boot-nanopi-neo/PLIST
index 0c9eaab7900..279a4c8b16d 100644
--- a/sysutils/u-boot-nanopi-neo/PLIST
+++ b/sysutils/u-boot-nanopi-neo/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/12 14:29:46 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/nanopi-neo/installboot.plist
 share/u-boot/nanopi-neo/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-nanopi-neo/installboot.plist b/sysutils/u-boot-nanopi-neo/installboot.plist
new file mode 100644
index 00000000000..309f42ba34a
--- /dev/null
+++ b/sysutils/u-boot-nanopi-neo/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>friendlyarm,nanopi-neo</key>
+	<dict>
+		<key>description</key>
+		<string>FriendlyARM NanoPi NEO</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index f44c8fe52cc..69b2ec1e1d4 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		4
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		5
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
diff --git a/sysutils/u-boot-nanopi-neo2/PLIST b/sysutils/u-boot-nanopi-neo2/PLIST
index dfe04407e7e..b708441b5be 100644
--- a/sysutils/u-boot-nanopi-neo2/PLIST
+++ b/sysutils/u-boot-nanopi-neo2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/11 20:34:18 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/nanopi-neo2/installboot.plist
 share/u-boot/nanopi-neo2/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-nanopi-neo2/installboot.plist b/sysutils/u-boot-nanopi-neo2/installboot.plist
new file mode 100644
index 00000000000..73b5246e8e7
--- /dev/null
+++ b/sysutils/u-boot-nanopi-neo2/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>friendlyarm,nanopi-neo2</key>
+	<dict>
+		<key>description</key>
+		<string>FriendlyARM NanoPi NEO 2</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-orangepi-2/Makefile b/sysutils/u-boot-orangepi-2/Makefile
index 69f2ea1c92f..3664cbce172 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		orangepi-2
 UBOOT_CONFIG=		orangepi_2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-orangepi-2/PLIST b/sysutils/u-boot-orangepi-2/PLIST
index 2dbf211dc93..792d026a6b0 100644
--- a/sysutils/u-boot-orangepi-2/PLIST
+++ b/sysutils/u-boot-orangepi-2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 16:04:26 jun Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/orangepi-2/installboot.plist
 share/u-boot/orangepi-2/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-orangepi-2/installboot.plist b/sysutils/u-boot-orangepi-2/installboot.plist
new file mode 100644
index 00000000000..0cf49bde8c2
--- /dev/null
+++ b/sysutils/u-boot-orangepi-2/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>xunlong,orangepi-2</key>
+	<dict>
+		<key>description</key>
+		<string>Xunlong Orange Pi 2</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile
index 82dec8c539e..949f12c549e 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		orangepi-one
 UBOOT_CONFIG=		orangepi_one_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-orangepi-one/PLIST b/sysutils/u-boot-orangepi-one/PLIST
index b94a619cf1c..1f6003735a0 100644
--- a/sysutils/u-boot-orangepi-one/PLIST
+++ b/sysutils/u-boot-orangepi-one/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/07 13:12:00 jun Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/orangepi-one/installboot.plist
 share/u-boot/orangepi-one/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-orangepi-one/installboot.plist b/sysutils/u-boot-orangepi-one/installboot.plist
new file mode 100644
index 00000000000..f2a78a417ec
--- /dev/null
+++ b/sysutils/u-boot-orangepi-one/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>xunlong,orangepi-one</key>
+	<dict>
+		<key>description</key>
+		<string>Xunlong Orange Pi One</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-orangepi-plus2e/Makefile b/sysutils/u-boot-orangepi-plus2e/Makefile
index 54b2b6acc6a..23a7e3c0ecf 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		orangepi-plus2e
 UBOOT_CONFIG=		orangepi_plus2e_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-orangepi-plus2e/PLIST b/sysutils/u-boot-orangepi-plus2e/PLIST
index 240c04b1d65..561d7cd432b 100644
--- a/sysutils/u-boot-orangepi-plus2e/PLIST
+++ b/sysutils/u-boot-orangepi-plus2e/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/12 14:29:11 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/orangepi-plus2e/installboot.plist
 share/u-boot/orangepi-plus2e/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-orangepi-plus2e/installboot.plist b/sysutils/u-boot-orangepi-plus2e/installboot.plist
new file mode 100644
index 00000000000..a89e3003890
--- /dev/null
+++ b/sysutils/u-boot-orangepi-plus2e/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>xunlong,orangepi-plus2e</key>
+	<dict>
+		<key>description</key>
+		<string>Xunlong Orange Pi Plus 2E</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-orangepi-zero-plus/Makefile b/sysutils/u-boot-orangepi-zero-plus/Makefile
index 46c567382b0..570788110bc 100644
--- a/sysutils/u-boot-orangepi-zero-plus/Makefile
+++ b/sysutils/u-boot-orangepi-zero-plus/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/07 14:06:24 thorpej Exp $
 
 UBOOT_TARGET=		orangepi-zero-plus
 UBOOT_CONFIG=		orangepi_zero_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		4
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		5
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=   el1
diff --git a/sysutils/u-boot-orangepi-zero-plus/PLIST b/sysutils/u-boot-orangepi-zero-plus/PLIST
index ed85cf8c62a..e78ff1bc420 100644
--- a/sysutils/u-boot-orangepi-zero-plus/PLIST
+++ b/sysutils/u-boot-orangepi-zero-plus/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/24 23:18:01 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:24 thorpej Exp $
+share/u-boot/orangepi-zero-plus/installboot.plist
 share/u-boot/orangepi-zero-plus/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-orangepi-zero-plus/installboot.plist b/sysutils/u-boot-orangepi-zero-plus/installboot.plist
new file mode 100644
index 00000000000..529d0434301
--- /dev/null
+++ b/sysutils/u-boot-orangepi-zero-plus/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:24 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>xunlong,orangepi-zero-plus</key>
+	<dict>
+		<key>description</key>
+		<string>Xunlong Orange Pi Zero Plus</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile
index dad88a5ec37..5b37c344250 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_TARGET=		orangepi-zero
 UBOOT_CONFIG=		orangepi_zero_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-orangepi-zero/PLIST b/sysutils/u-boot-orangepi-zero/PLIST
index 73568ca9ba8..87e37316eff 100644
--- a/sysutils/u-boot-orangepi-zero/PLIST
+++ b/sysutils/u-boot-orangepi-zero/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/23 10:48:27 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/orangepi-zero/installboot.plist
 share/u-boot/orangepi-zero/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-orangepi-zero/installboot.plist b/sysutils/u-boot-orangepi-zero/installboot.plist
new file mode 100644
index 00000000000..8471896eb61
--- /dev/null
+++ b/sysutils/u-boot-orangepi-zero/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>xunlong,orangepi-zero</key>
+	<dict>
+		<key>description</key>
+		<string>Xunlong Orange Pi Zero</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile
index 639a8eacec4..c2089da5317 100644
--- a/sysutils/u-boot-pine-h64/Makefile
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_TARGET=		pine-h64
 UBOOT_CONFIG=		pine_h64_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC}
diff --git a/sysutils/u-boot-pine-h64/PLIST b/sysutils/u-boot-pine-h64/PLIST
index b625ccd4d50..21cc5932cc6 100644
--- a/sysutils/u-boot-pine-h64/PLIST
+++ b/sysutils/u-boot-pine-h64/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/05/26 17:53:18 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/pine-h64/installboot.plist
 share/u-boot/pine-h64/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-pine-h64/installboot.plist b/sysutils/u-boot-pine-h64/installboot.plist
new file mode 100644
index 00000000000..e97070dee2a
--- /dev/null
+++ b/sysutils/u-boot-pine-h64/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>pine64,pine-h64</key>
+	<dict>
+		<key>description</key>
+		<string>Pine H64</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 0123cec1a16..57c177900a0 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		4
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		5
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
diff --git a/sysutils/u-boot-pine64/PLIST b/sysutils/u-boot-pine64/PLIST
index f63cde926c7..6d219fc34f0 100644
--- a/sysutils/u-boot-pine64/PLIST
+++ b/sysutils/u-boot-pine64/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/07 15:37:21 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/pine64/installboot.plist
 share/u-boot/pine64/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-pine64/installboot.plist b/sysutils/u-boot-pine64/installboot.plist
new file mode 100644
index 00000000000..1a7ee4cd845
--- /dev/null
+++ b/sysutils/u-boot-pine64/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>pine64,pine64</key>
+	<dict>
+		<key>description</key>
+		<string>Pine64</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index e963148313e..6e4e39986ed 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.12 2019/02/27 06:25:37 martin Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_VERSION=		2018.11rc3
 UBOOT_TARGET=		pinebook
 UBOOT_CONFIG=		pinebook_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
 # Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
 MASTER_SITES=		${MASTER_SITE_GITHUB:=anarsoul/}
 GITHUB_PROJECT=		u-boot-pine64
 GITHUB_TAG=		88eea875b3b82a0e50cbb112e0aea2259dc2e011
 DISTNAME=		u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 EXTRACT_SUFX=		.tar.gz
-PKGREVISION=		2
+PKGREVISION=		3
 
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/u-boot-pinebook/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/u-boot-pinebook/patches
diff --git a/sysutils/u-boot-pinebook/PLIST b/sysutils/u-boot-pinebook/PLIST
index 04b07d3e1be..ef831a7198d 100644
--- a/sysutils/u-boot-pinebook/PLIST
+++ b/sysutils/u-boot-pinebook/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/pinebook/installboot.plist
 share/u-boot/pinebook/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-pinebook/installboot.plist b/sysutils/u-boot-pinebook/installboot.plist
new file mode 100644
index 00000000000..5439af54070
--- /dev/null
+++ b/sysutils/u-boot-pinebook/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>pine64,pinebook</key>
+	<dict>
+		<key>description</key>
+		<string>Pinebook</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-pocketchip/Makefile b/sysutils/u-boot-pocketchip/Makefile
index 2864336b789..acc89a849eb 100644
--- a/sysutils/u-boot-pocketchip/Makefile
+++ b/sysutils/u-boot-pocketchip/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_TARGET=		pocketchip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		4
 
 UBOOT_OPTIONS+=		CONFIG_I2C1_ENABLE=y
 UBOOT_OPTIONS+=		CONFIG_AXP_GPIO=y
diff --git a/sysutils/u-boot-pocketchip/PLIST b/sysutils/u-boot-pocketchip/PLIST
index 611dc79d579..c132a7867b8 100644
--- a/sysutils/u-boot-pocketchip/PLIST
+++ b/sysutils/u-boot-pocketchip/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/27 19:24:55 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/pocketchip/installboot.plist
 share/u-boot/pocketchip/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-pocketchip/installboot.plist b/sysutils/u-boot-pocketchip/installboot.plist
new file mode 100644
index 00000000000..2b9ce878a19
--- /dev/null
+++ b/sysutils/u-boot-pocketchip/installboot.plist
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>nextthing,pocketchip</key>
+	<dict>
+		<key>description</key>
+		<string>NextThing PocketC.H.I.P.</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/sysutils/u-boot-sopine-baseboard/Makefile b/sysutils/u-boot-sopine-baseboard/Makefile
index 9fcb052b6a0..d290408427e 100644
--- a/sysutils/u-boot-sopine-baseboard/Makefile
+++ b/sysutils/u-boot-sopine-baseboard/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:30 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/07 14:06:25 thorpej Exp $
 
 UBOOT_TARGET=		sopine-baseboard
 UBOOT_CONFIG=		sopine_baseboard_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_ENV+=		DEVICE_TREE=sun50i-a64-sopine-baseboard
 
-PKGREVISION=		4
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=		5
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
diff --git a/sysutils/u-boot-sopine-baseboard/PLIST b/sysutils/u-boot-sopine-baseboard/PLIST
index 67b308462ce..33cb44ccc83 100644
--- a/sysutils/u-boot-sopine-baseboard/PLIST
+++ b/sysutils/u-boot-sopine-baseboard/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/07 00:58:27 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/07 14:06:25 thorpej Exp $
+share/u-boot/sopine-baseboard/installboot.plist
 share/u-boot/sopine-baseboard/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-sopine-baseboard/installboot.plist b/sysutils/u-boot-sopine-baseboard/installboot.plist
new file mode 100644
index 00000000000..aa2a5c92dc1
--- /dev/null
+++ b/sysutils/u-boot-sopine-baseboard/installboot.plist
@@ -0,0 +1,63 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/07 14:06:25 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>pine64,sopine-baseboard</key>
+	<dict>
+		<key>description</key>
+		<string>SoPine with baseboard</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+
+	<!-- Pine64 LTS uses the same u-boot image. -->
+	<key>pine64,pine64-lts</key>
+	<dict>
+		<key>description</key>
+		<string>Pine64 LTS</string>
+		<key>u-boot-install</key>
+		<array>
+			<dict>
+				<key>file-name</key>
+				<string>u-boot-sunxi-with-spl.bin</string>
+				<key>image-offset</key>
+				<integer>8192</integer>
+			</dict>
+		</array>
+	</dict>
+</dict>
+</plist>