Mon Jan 27 08:02:30 2020 UTC ()
Add installboot(8) configurations for Rock64, RockPro64 and Pinebook Pro.


(thorpej)
diff -r1.787 -r1.788 pkgsrc/doc/CHANGES-2020
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pinebook-pro/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-pinebook-pro/files/installboot.plist
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-rock64/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-rock64/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-rock64/files/installboot.plist
diff -r1.7 -r1.8 pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-rockpro64/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-rockpro64/files/installboot.plist
cvs diff -r1.787 -r1.788 pkgsrc/doc/CHANGES-2020 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2020 2020/01/27 06:27:49 1.787
+++ pkgsrc/doc/CHANGES-2020 2020/01/27 08:02:29 1.788
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2020,v 1.787 2020/01/27 06:27:49 adam Exp $ 1$NetBSD: CHANGES-2020,v 1.788 2020/01/27 08:02:29 thorpej Exp $
2 2
3Changes to the packages collection and infrastructure in 2020: 3Changes to the packages collection and infrastructure in 2020:
4 4
5 Updated devel/p5-Date-Manip to 6.79 [mef 2020-01-01] 5 Updated devel/p5-Date-Manip to 6.79 [mef 2020-01-01]
6 Updated devel/p5-IO-Async to 0.75 [mef 2020-01-01] 6 Updated devel/p5-IO-Async to 0.75 [mef 2020-01-01]
7 Updated devel/samurai to 1.0 [ng0 2020-01-01] 7 Updated devel/samurai to 1.0 [ng0 2020-01-01]
8 Updated www/nsm to 1.25 [ng0 2020-01-01] 8 Updated www/nsm to 1.25 [ng0 2020-01-01]
9 Updated textproc/json-yaml to 1.2.1 [sjmulder 2020-01-01] 9 Updated textproc/json-yaml to 1.2.1 [sjmulder 2020-01-01]
10 Updated security/doas to 6.2p4 [ng0 2020-01-01] 10 Updated security/doas to 6.2p4 [ng0 2020-01-01]
11 Updated devel/p5-B-Keywords to 1.21 [mef 2020-01-01] 11 Updated devel/p5-B-Keywords to 1.21 [mef 2020-01-01]
12 Updated devel/p5-EV to 4.31 [mef 2020-01-01] 12 Updated devel/p5-EV to 4.31 [mef 2020-01-01]
13 Updated security/sudo to 1.8.30 [kim 2020-01-01] 13 Updated security/sudo to 1.8.30 [kim 2020-01-01]
14 Removed graphics/qiviewer [kamil 2020-01-01] 14 Removed graphics/qiviewer [kamil 2020-01-01]
@@ -931,13 +931,16 @@ Changes to the packages collection and i @@ -931,13 +931,16 @@ Changes to the packages collection and i
931 Updated devel/lemon to 1.0.3.31.0 [adam 2020-01-26] 931 Updated devel/lemon to 1.0.3.31.0 [adam 2020-01-26]
932 Updated devel/py-coverage to 5.0.3 [adam 2020-01-26] 932 Updated devel/py-coverage to 5.0.3 [adam 2020-01-26]
933 Updated fonts/py-fonttools to 4.2.4 [adam 2020-01-26] 933 Updated fonts/py-fonttools to 4.2.4 [adam 2020-01-26]
934 Updated databases/csharp-mysql to 8.0.19 [nia 2020-01-26] 934 Updated databases/csharp-mysql to 8.0.19 [nia 2020-01-26]
935 Updated x11/py-qt5 to 5.13.2nb2 [rhialto 2020-01-26] 935 Updated x11/py-qt5 to 5.13.2nb2 [rhialto 2020-01-26]
936 Updated x11/py-qt5-qscintilla to 2.11.2nb3 [rhialto 2020-01-26] 936 Updated x11/py-qt5-qscintilla to 2.11.2nb3 [rhialto 2020-01-26]
937 Updated x11/qt5-qscintilla to 2.11.2nb2 [rhialto 2020-01-26] 937 Updated x11/qt5-qscintilla to 2.11.2nb2 [rhialto 2020-01-26]
938 Updated devel/R-callr to 3.4.1 [mef 2020-01-26] 938 Updated devel/R-callr to 3.4.1 [mef 2020-01-26]
939 Updated pkgtools/pkglint to 19.4.6 [rillig 2020-01-26] 939 Updated pkgtools/pkglint to 19.4.6 [rillig 2020-01-26]
940 Updated lang/quickjs to 20200119 [he 2020-01-26] 940 Updated lang/quickjs to 20200119 [he 2020-01-26]
941 Updated multimedia/mpv to 0.32.0 [leot 2020-01-26] 941 Updated multimedia/mpv to 0.32.0 [leot 2020-01-26]
942 Added graphics/py-OpenGL-accelerate version 3.1.5 [adam 2020-01-27] 942 Added graphics/py-OpenGL-accelerate version 3.1.5 [adam 2020-01-27]
943 Updated graphics/py-OpenGL to 3.1.5 [adam 2020-01-27] 943 Updated graphics/py-OpenGL to 3.1.5 [adam 2020-01-27]
 944 Updated sysutils/u-boot-pinebook-pro to 2020.01.rc5nb3 [thorpej 2020-01-27]
 945 Updated sysutils/u-boot-rock64 to 2017.09nb6 [thorpej 2020-01-27]
 946 Updated sysutils/u-boot-rockpro64 to 2017.09nb7 [thorpej 2020-01-27]
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pinebook-pro/Makefile 2020/01/14 09:01:53 1.4
+++ pkgsrc/sysutils/u-boot-pinebook-pro/Makefile 2020/01/27 08:02:29 1.5
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1# $NetBSD: Makefile,v 1.4 2020/01/14 09:01:53 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2020/01/27 08:02:29 thorpej Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 3
4 4
5UBOOT_TARGET= pinebook-pro 5UBOOT_TARGET= pinebook-pro
6UBOOT_CONFIG= pinebook_pro-rk3399_defconfig 6UBOOT_CONFIG= pinebook_pro-rk3399_defconfig
7UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb 7UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
8 8
 9UBOOT_INSTALLBOOT_PLIST= installboot.plist
 10
9U_BOOT_IMAGE_TYPE= rk3399 11U_BOOT_IMAGE_TYPE= rk3399
10 12
11.include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk" 13.include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pinebook-pro/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pinebook-pro/PLIST 2020/01/14 08:44:03 1.3
+++ pkgsrc/sysutils/u-boot-pinebook-pro/PLIST 2020/01/27 08:02:29 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1@comment $NetBSD: PLIST,v 1.3 2020/01/14 08:44:03 mrg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/01/27 08:02:29 thorpej Exp $
2share/u-boot/pinebook-pro/idbloader.img 2share/u-boot/pinebook-pro/idbloader.img
 3share/u-boot/pinebook-pro/installboot.plist
3share/u-boot/pinebook-pro/rksd_loader.img 4share/u-boot/pinebook-pro/rksd_loader.img
4share/u-boot/pinebook-pro/rkspi_loader.img 5share/u-boot/pinebook-pro/rkspi_loader.img
5share/u-boot/pinebook-pro/u-boot.itb 6share/u-boot/pinebook-pro/u-boot.itb
File Added: pkgsrc/sysutils/u-boot-pinebook-pro/files/installboot.plist
<!-- $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>
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-rock64/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-rock64/Makefile 2019/09/15 15:50:22 1.4
+++ pkgsrc/sysutils/u-boot-rock64/Makefile 2020/01/27 08:02:30 1.5
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.4 2019/09/15 15:50:22 tnn Exp $ 1# $NetBSD: Makefile,v 1.5 2020/01/27 08:02:30 thorpej Exp $
2 2
3PKGREVISION= 5 3PKGREVISION= 6
4UBOOT_TARGET= rock64 4UBOOT_TARGET= rock64
5UBOOT_CONFIG= rock64-rk3328_defconfig 5UBOOT_CONFIG= rock64-rk3328_defconfig
6UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb 6UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
7 7
 8UBOOT_INSTALLBOOT_PLIST= installboot.plist
 9
8DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
9 11
10U_BOOT_IMAGE_TYPE= rk3328 12U_BOOT_IMAGE_TYPE= rk3328
11.include "../../sysutils/u-boot/u-boot-rockchip.mk" 13.include "../../sysutils/u-boot/u-boot-rockchip.mk"
12 14
13# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware 15# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
14# XXX LICENSE? 16# XXX LICENSE?
15BL31= rk322xh_bl31_v1.41.elf 17BL31= rk322xh_bl31_v1.41.elf
16DISTFILES+= ${BL31} 18DISTFILES+= ${BL31}
17SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/fc322b129b4438307ac18cbdc73c38400c7b33d9/bin/rk33/} 19SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/fc322b129b4438307ac18cbdc73c38400c7b33d9/bin/rk33/}
18 20
19# DDR init binary 21# DDR init binary
20DDR_BIN= rk3328_ddr_333MHz_v1.16.bin 22DDR_BIN= rk3328_ddr_333MHz_v1.16.bin
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-rock64/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-rock64/PLIST 2019/08/13 21:28:46 1.2
+++ pkgsrc/sysutils/u-boot-rock64/PLIST 2020/01/27 08:02:30 1.3
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1@comment $NetBSD: PLIST,v 1.2 2019/08/13 21:28:46 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/01/27 08:02:30 thorpej Exp $
2share/u-boot/rock64/idbloader.img 2share/u-boot/rock64/idbloader.img
 3share/u-boot/rock64/installboot.plist
3share/u-boot/rock64/rksd_loader.img 4share/u-boot/rock64/rksd_loader.img
4share/u-boot/rock64/rkspi_loader.img 5share/u-boot/rock64/rkspi_loader.img
5share/u-boot/rock64/u-boot.itb 6share/u-boot/rock64/u-boot.itb
File Added: pkgsrc/sysutils/u-boot-rock64/files/installboot.plist
<!-- $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>
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/u-boot-rockpro64/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-rockpro64/Makefile 2019/09/15 20:13:31 1.7
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile 2020/01/27 08:02:30 1.8
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.7 2019/09/15 20:13:31 tnn Exp $ 1# $NetBSD: Makefile,v 1.8 2020/01/27 08:02:30 thorpej Exp $
2 2
3PKGREVISION= 6 3PKGREVISION= 7
4UBOOT_TARGET= rockpro64 4UBOOT_TARGET= rockpro64
5UBOOT_CONFIG= rockpro64-rk3399_defconfig 5UBOOT_CONFIG= rockpro64-rk3399_defconfig
6UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb 6UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
7 7
 8UBOOT_INSTALLBOOT_PLIST= installboot.plist
 9
8DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo
9 11
10U_BOOT_IMAGE_TYPE= rk3399 12U_BOOT_IMAGE_TYPE= rk3399
11.include "../../sysutils/u-boot/u-boot-rockchip.mk" 13.include "../../sysutils/u-boot/u-boot-rockchip.mk"
12 14
13# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware 15# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
14# XXX LICENSE? 16# XXX LICENSE?
15BL31= rk3399_bl31_v1.29.elf # if you bump this, adjust pre-build target! 17BL31= rk3399_bl31_v1.29.elf # if you bump this, adjust pre-build target!
16DISTFILES+= ${BL31} 18DISTFILES+= ${BL31}
17SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/0b8a4e66958b5d3d87fc61fc4bd8e069c79e931a/bin/rk33/} 19SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/0b8a4e66958b5d3d87fc61fc4bd8e069c79e931a/bin/rk33/}
18 20
19# DDR init binary 21# DDR init binary
20DDR_BIN= rk3399_ddr_800MHz_v1.23.bin 22DDR_BIN= rk3399_ddr_800MHz_v1.23.bin
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-rockpro64/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-rockpro64/PLIST 2019/08/13 21:28:47 1.3
+++ pkgsrc/sysutils/u-boot-rockpro64/PLIST 2020/01/27 08:02:30 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1@comment $NetBSD: PLIST,v 1.3 2019/08/13 21:28:47 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/01/27 08:02:30 thorpej Exp $
2share/u-boot/rockpro64/idbloader.img 2share/u-boot/rockpro64/idbloader.img
 3share/u-boot/rockpro64/installboot.plist
3share/u-boot/rockpro64/rksd_loader.img 4share/u-boot/rockpro64/rksd_loader.img
4share/u-boot/rockpro64/rkspi_loader.img 5share/u-boot/rockpro64/rkspi_loader.img
5share/u-boot/rockpro64/u-boot.itb 6share/u-boot/rockpro64/u-boot.itb
File Added: pkgsrc/sysutils/u-boot-rockpro64/files/installboot.plist
<!-- $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>