Sat Apr 4 15:20:35 2020 UTC ()
Add a package for u-boot on the OrangePi Lite2.


(thorpej)
diff -r1.868 -r1.869 pkgsrc/sysutils/Makefile
diff -r1.28 -r1.29 pkgsrc/sysutils/u-boot/Makefile
diff -r1.31 -r1.32 pkgsrc/sysutils/u-boot/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-orangepi-lite2/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-orangepi-lite2/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-orangepi-lite2/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-orangepi-lite2/files/installboot.plist
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h6-orangepi-one-plus.dts
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_include_asm_arch-sunxi_cpu_sun50i_h6.h
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_mach-sunxi_board.c
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-configs_orangepi_lite2_defconfig

cvs diff -r1.868 -r1.869 pkgsrc/sysutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/Makefile 2020/03/21 19:26:59 1.868
+++ pkgsrc/sysutils/Makefile 2020/04/04 15:20:34 1.869
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.868 2020/03/21 19:26:59 adam Exp $ 1# $NetBSD: Makefile,v 1.869 2020/04/04 15:20:34 thorpej Exp $
2# 2#
3 3
4COMMENT= System utilities 4COMMENT= System utilities
5 5
6SUBDIR+= 855resolution 6SUBDIR+= 855resolution
7SUBDIR+= 915resolution 7SUBDIR+= 915resolution
8SUBDIR+= 9base 8SUBDIR+= 9base
9SUBDIR+= R-later 9SUBDIR+= R-later
10SUBDIR+= R-processx 10SUBDIR+= R-processx
11SUBDIR+= R-progress 11SUBDIR+= R-progress
12SUBDIR+= R-ps 12SUBDIR+= R-ps
13SUBDIR+= R-sys 13SUBDIR+= R-sys
14SUBDIR+= R-xopen 14SUBDIR+= R-xopen
@@ -653,26 +653,27 @@ SUBDIR+= u-boot-jetson-tx1 @@ -653,26 +653,27 @@ SUBDIR+= u-boot-jetson-tx1
653SUBDIR+= u-boot-jetson-tx2 653SUBDIR+= u-boot-jetson-tx2
654SUBDIR+= u-boot-lamobo-r1 654SUBDIR+= u-boot-lamobo-r1
655SUBDIR+= u-boot-libretech-cc 655SUBDIR+= u-boot-libretech-cc
656SUBDIR+= u-boot-nanopi-duo2 656SUBDIR+= u-boot-nanopi-duo2
657SUBDIR+= u-boot-nanopi-m1 657SUBDIR+= u-boot-nanopi-m1
658SUBDIR+= u-boot-nanopi-neo 658SUBDIR+= u-boot-nanopi-neo
659SUBDIR+= u-boot-nanopi-neo-plus2 659SUBDIR+= u-boot-nanopi-neo-plus2
660SUBDIR+= u-boot-nanopi-neo2 660SUBDIR+= u-boot-nanopi-neo2
661SUBDIR+= u-boot-nanopi-r1 661SUBDIR+= u-boot-nanopi-r1
662SUBDIR+= u-boot-odroid-c2 662SUBDIR+= u-boot-odroid-c2
663SUBDIR+= u-boot-odroid-xu3 663SUBDIR+= u-boot-odroid-xu3
664SUBDIR+= u-boot-orangepi-2 664SUBDIR+= u-boot-orangepi-2
665SUBDIR+= u-boot-orangepi-lite 665SUBDIR+= u-boot-orangepi-lite
 666SUBDIR+= u-boot-orangepi-lite2
666SUBDIR+= u-boot-orangepi-one 667SUBDIR+= u-boot-orangepi-one
667SUBDIR+= u-boot-orangepi-plus2e 668SUBDIR+= u-boot-orangepi-plus2e
668SUBDIR+= u-boot-orangepi-zero 669SUBDIR+= u-boot-orangepi-zero
669SUBDIR+= u-boot-orangepi-zero-plus 670SUBDIR+= u-boot-orangepi-zero-plus
670SUBDIR+= u-boot-pine-h64 671SUBDIR+= u-boot-pine-h64
671SUBDIR+= u-boot-pine64 672SUBDIR+= u-boot-pine64
672SUBDIR+= u-boot-pinebook 673SUBDIR+= u-boot-pinebook
673SUBDIR+= u-boot-pinebook-pro 674SUBDIR+= u-boot-pinebook-pro
674SUBDIR+= u-boot-pocketchip 675SUBDIR+= u-boot-pocketchip
675SUBDIR+= u-boot-rock64 676SUBDIR+= u-boot-rock64
676SUBDIR+= u-boot-rockpro64 677SUBDIR+= u-boot-rockpro64
677SUBDIR+= u-boot-rpi3-32 678SUBDIR+= u-boot-rpi3-32
678SUBDIR+= u-boot-sopine-baseboard 679SUBDIR+= u-boot-sopine-baseboard

cvs diff -r1.28 -r1.29 pkgsrc/sysutils/u-boot/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/Makefile 2020/03/15 14:09:48 1.28
+++ pkgsrc/sysutils/u-boot/Makefile 2020/04/04 15:20:35 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2020/03/15 14:09:48 uwe Exp $ 1# $NetBSD: Makefile,v 1.29 2020/04/04 15:20:35 thorpej Exp $
2# 2#
3 3
4.include "../../sysutils/u-boot/u-boot-version.mk" 4.include "../../sysutils/u-boot/u-boot-version.mk"
5 5
6DISTNAME= u-boot-${UBOOT_VERSION} 6DISTNAME= u-boot-${UBOOT_VERSION}
7PKGREVISION= 9 7PKGREVISION= 9
8CATEGORIES= meta-pkgs sysutils u-boot 8CATEGORIES= meta-pkgs sysutils u-boot
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10 10
11MAINTAINER= jmcneill@NetBSD.org 11MAINTAINER= jmcneill@NetBSD.org
12HOMEPAGE= https://www.denx.de/wiki/U-Boot 12HOMEPAGE= https://www.denx.de/wiki/U-Boot
13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package) 13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package)
14 14
@@ -46,26 +46,27 @@ DEPENDS+= u-boot-libretech-cc-[0-9]*:../ @@ -46,26 +46,27 @@ DEPENDS+= u-boot-libretech-cc-[0-9]*:../
46.endif 46.endif
47DEPENDS+= u-boot-nanopi-duo2-[0-9]*:../../sysutils/u-boot-nanopi-duo2 47DEPENDS+= u-boot-nanopi-duo2-[0-9]*:../../sysutils/u-boot-nanopi-duo2
48DEPENDS+= u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1 48DEPENDS+= u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1
49DEPENDS+= u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2 49DEPENDS+= u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2
50DEPENDS+= u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo 50DEPENDS+= u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo
51DEPENDS+= u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2 51DEPENDS+= u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2
52DEPENDS+= u-boot-nanopi-r1-[0-9]*:../../sysutils/u-boot-nanopi-r1 52DEPENDS+= u-boot-nanopi-r1-[0-9]*:../../sysutils/u-boot-nanopi-r1
53.if !empty(PKG_OPTIONS:Mamlogic-meson) 53.if !empty(PKG_OPTIONS:Mamlogic-meson)
54DEPENDS+= u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2 54DEPENDS+= u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2
55.endif 55.endif
56DEPENDS+= u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3 56DEPENDS+= u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3
57DEPENDS+= u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2 57DEPENDS+= u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2
58DEPENDS+= u-boot-orangepi-lite-[0-9]*:../../sysutils/u-boot-orangepi-lite 58DEPENDS+= u-boot-orangepi-lite-[0-9]*:../../sysutils/u-boot-orangepi-lite
 59DEPENDS+= u-boot-orangepi-lite2-[0-9]*:../../sysutils/u-boot-orangepi-lite2
59DEPENDS+= u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one 60DEPENDS+= u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one
60DEPENDS+= u-boot-orangepi-plus2e-[0-9]*:../../sysutils/u-boot-orangepi-plus2e 61DEPENDS+= u-boot-orangepi-plus2e-[0-9]*:../../sysutils/u-boot-orangepi-plus2e
61DEPENDS+= u-boot-orangepi-zero-[0-9]*:../../sysutils/u-boot-orangepi-zero 62DEPENDS+= u-boot-orangepi-zero-[0-9]*:../../sysutils/u-boot-orangepi-zero
62DEPENDS+= u-boot-orangepi-zero-plus-[0-9]*:../../sysutils/u-boot-orangepi-zero-plus 63DEPENDS+= u-boot-orangepi-zero-plus-[0-9]*:../../sysutils/u-boot-orangepi-zero-plus
63DEPENDS+= u-boot-pine-h64-[0-9]*:../../sysutils/u-boot-pine-h64 64DEPENDS+= u-boot-pine-h64-[0-9]*:../../sysutils/u-boot-pine-h64
64DEPENDS+= u-boot-pine64-[0-9]*:../../sysutils/u-boot-pine64 65DEPENDS+= u-boot-pine64-[0-9]*:../../sysutils/u-boot-pine64
65DEPENDS+= u-boot-pinebook-[0-9]*:../../sysutils/u-boot-pinebook 66DEPENDS+= u-boot-pinebook-[0-9]*:../../sysutils/u-boot-pinebook
66DEPENDS+= u-boot-pinebook-pro-[0-9]*:../../sysutils/u-boot-pinebook-pro 67DEPENDS+= u-boot-pinebook-pro-[0-9]*:../../sysutils/u-boot-pinebook-pro
67DEPENDS+= u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip 68DEPENDS+= u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip
68DEPENDS+= u-boot-rock64-[0-9]*:../../sysutils/u-boot-rock64 69DEPENDS+= u-boot-rock64-[0-9]*:../../sysutils/u-boot-rock64
69DEPENDS+= u-boot-rockpro64-[0-9]*:../../sysutils/u-boot-rockpro64 70DEPENDS+= u-boot-rockpro64-[0-9]*:../../sysutils/u-boot-rockpro64
70DEPENDS+= u-boot-rpi3-32-[0-9]*:../../sysutils/u-boot-rpi3-32 71DEPENDS+= u-boot-rpi3-32-[0-9]*:../../sysutils/u-boot-rpi3-32
71DEPENDS+= u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard 72DEPENDS+= u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard

cvs diff -r1.31 -r1.32 pkgsrc/sysutils/u-boot/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo 2020/03/30 16:30:54 1.31
+++ pkgsrc/sysutils/u-boot/distinfo 2020/04/04 15:20:35 1.32
@@ -1,31 +1,35 @@ @@ -1,31 +1,35 @@
1$NetBSD: distinfo,v 1.31 2020/03/30 16:30:54 riastradh Exp $ 1$NetBSD: distinfo,v 1.32 2020/04/04 15:20:35 thorpej Exp $
2 2
3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff 5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes 6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes
7SHA1 (patch-Makefile) = 5b86d70e05620cc3133faf508e983e2fe6ca6603 7SHA1 (patch-Makefile) = 5b86d70e05620cc3133faf508e983e2fe6ca6603
8SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 8SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
9SHA1 (patch-arch_arm_dts_Makefile) = a64a01255af3d2a744fe7b923c66fd8ce0f9d489 9SHA1 (patch-arch_arm_dts_Makefile) = 1941cb6e1300f14b624d8a3126a09def8654f8e4
 10SHA1 (patch-arch_arm_dts_sun50i-h6-orangepi-one-plus.dts) = 0baa27eb56458be290a7cfcc81ca606f6439b1cf
10SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-m2-zero.dts) = aaa530a5f520eea0cb5dcece0b730e23db59eb40 11SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-m2-zero.dts) = aaa530a5f520eea0cb5dcece0b730e23db59eb40
11SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-p2-zero.dts) = 8c78d0e0877aa9784fa209af2e16e80cb1110364 12SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-p2-zero.dts) = 8c78d0e0877aa9784fa209af2e16e80cb1110364
12SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts) = ec4927bb5f024f9aca6f71890c4bc14dc53e8ba7 13SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts) = ec4927bb5f024f9aca6f71890c4bc14dc53e8ba7
13SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts) = a192c05c31038cf11354dd4a32d94b5b62945661 14SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts) = a192c05c31038cf11354dd4a32d94b5b62945661
 15SHA1 (patch-arch_arm_include_asm_arch-sunxi_cpu_sun50i_h6.h) = 49c6373884852aeff535830f21c12e807ed74988
 16SHA1 (patch-arch_arm_mach-sunxi_board.c) = 1e707066636b4ddf57fb5d3b9319371812de6d74
14SHA1 (patch-arch_powerpc_include_asm_byteorder.h) = 8cab2805c6b21c986f7b4e2c38db11dfcea28c42 17SHA1 (patch-arch_powerpc_include_asm_byteorder.h) = 8cab2805c6b21c986f7b4e2c38db11dfcea28c42
15SHA1 (patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 425ae3a82ce9006dbd734f41f7d49bb3587b1493 18SHA1 (patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 425ae3a82ce9006dbd734f41f7d49bb3587b1493
16SHA1 (patch-configs_A20-OLinuXino-Lime2_defconfig) = 9eecb0a44ec9ddda2425b042c219f59ba546a494 19SHA1 (patch-configs_A20-OLinuXino-Lime2_defconfig) = 9eecb0a44ec9ddda2425b042c219f59ba546a494
17SHA1 (patch-configs_bananapi_m2_zero_defconfig) = 5e4baef63f0e51cb8c94a1dc0c0e50ecb016807d 20SHA1 (patch-configs_bananapi_m2_zero_defconfig) = 5e4baef63f0e51cb8c94a1dc0c0e50ecb016807d
18SHA1 (patch-configs_bananapi_p2_zero_defconfig) = 6468b3246cbf35d10320c8a974fc06b794ae68dc 21SHA1 (patch-configs_bananapi_p2_zero_defconfig) = 6468b3246cbf35d10320c8a974fc06b794ae68dc
19SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 22SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95
20SHA1 (patch-configs_nanopi__duo2__defconfig) = 1464c4eb5d31779caa5714386891ae60b25c1825 23SHA1 (patch-configs_nanopi__duo2__defconfig) = 1464c4eb5d31779caa5714386891ae60b25c1825
21SHA1 (patch-configs_nanopi__r1__defconfig) = deb0edece928cd0a761451b034757a31cb17760f 24SHA1 (patch-configs_nanopi__r1__defconfig) = deb0edece928cd0a761451b034757a31cb17760f
 25SHA1 (patch-configs_orangepi_lite2_defconfig) = e3426f649bb6e8ab2045a5f1cbe32e83b14cb8ef
22SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c 26SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c
23SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 27SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
24SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 28SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4
25SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 29SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
26SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe 30SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe
27SHA1 (patch-lib_bch.c) = 90ed120d00218ae79e317bc3c3019a04e68dbaeb 31SHA1 (patch-lib_bch.c) = 90ed120d00218ae79e317bc3c3019a04e68dbaeb
28SHA1 (patch-lib_efi__loader_efi__boottime.c) = 66aa3b95470a737154e6e082447aed0078092047 32SHA1 (patch-lib_efi__loader_efi__boottime.c) = 66aa3b95470a737154e6e082447aed0078092047
29SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d 33SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d
30SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = 539a77db792bbd479b5c7cf81c0a8e114c859d9d 34SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = 539a77db792bbd479b5c7cf81c0a8e114c859d9d
31SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 35SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042

File Added: pkgsrc/sysutils/u-boot-orangepi-lite2/DESCR
U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
several other processors, which can be installed in a boot ROM and used to
initialize and test the hardware or to download and run application code.

This package provides U-Boot for the Xunlong Orange Pi Lite 2.

File Added: pkgsrc/sysutils/u-boot-orangepi-lite2/Makefile
# $NetBSD: Makefile,v 1.1 2020/04/04 15:20:35 thorpej Exp $

UBOOT_TARGET=		orangepi-lite2
UBOOT_CONFIG=		orangepi_lite2_defconfig
UBOOT_BIN=		u-boot-sunxi-with-spl.bin

UBOOT_INSTALLBOOT_PLIST=	installboot.plist

post-extract:
	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC}

post-build:
	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin

.include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk"
.include "../../sysutils/u-boot/u-boot-arm64.mk"

File Added: pkgsrc/sysutils/u-boot-orangepi-lite2/PLIST
@comment $NetBSD: PLIST,v 1.1 2020/04/04 15:20:35 thorpej Exp $
share/u-boot/orangepi-lite2/installboot.plist
share/u-boot/orangepi-lite2/u-boot-sunxi-with-spl.bin

File Added: pkgsrc/sysutils/u-boot-orangepi-lite2/files/installboot.plist
<!-- $NetBSD: installboot.plist,v 1.1 2020/04/04 15:20:35 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-lite2</key>
	<dict>
		<key>description</key>
		<string>Xunlong Orange Pi Lite2</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>

cvs diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile 2019/10/08 20:48:49 1.6
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile 2020/04/04 15:20:35 1.7
@@ -1,28 +1,37 @@ @@ -1,28 +1,37 @@
1$NetBSD: patch-arch_arm_dts_Makefile,v 1.6 2019/10/08 20:48:49 bad Exp $ 1$NetBSD: patch-arch_arm_dts_Makefile,v 1.7 2020/04/04 15:20:35 thorpej Exp $
2 2
3Add device tree files for: 3Add device tree files for:
4- Banana Pi BPI-M2 Zero 4- Banana Pi BPI-M2 Zero
5- Banana Pi BPI-P2 Zero 5- Banana Pi BPI-P2 Zero
6- FriendlyArm NanoPi R1 6- FriendlyArm NanoPi R1
7- FriendlyArm NanoPi Duo2 7- FriendlyArm NanoPi Duo2
 8- OrangePi Lite 2
8 9
9--- arch/arm/dts/Makefile.orig 2018-11-14 16:10:06.000000000 +0000 10--- arch/arm/dts/Makefile.orig 2018-11-14 16:10:06.000000000 +0000
10+++ arch/arm/dts/Makefile 11+++ arch/arm/dts/Makefile
11@@ -365,6 +365,8 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ 12@@ -365,6 +365,8 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
12 sun8i-a83t-cubietruck-plus.dtb \ 13 sun8i-a83t-cubietruck-plus.dtb \
13 sun8i-a83t-tbs-a711.dts 14 sun8i-a83t-tbs-a711.dts
14 dtb-$(CONFIG_MACH_SUN8I_H3) += \ 15 dtb-$(CONFIG_MACH_SUN8I_H3) += \
15+ sun8i-h2-plus-bananapi-m2-zero.dtb \ 16+ sun8i-h2-plus-bananapi-m2-zero.dtb \
16+ sun8i-h2-plus-bananapi-p2-zero.dtb \ 17+ sun8i-h2-plus-bananapi-p2-zero.dtb \
17 sun8i-h2-plus-libretech-all-h3-cc.dtb \ 18 sun8i-h2-plus-libretech-all-h3-cc.dtb \
18 sun8i-h2-plus-orangepi-r1.dtb \ 19 sun8i-h2-plus-orangepi-r1.dtb \
19 sun8i-h2-plus-orangepi-zero.dtb \ 20 sun8i-h2-plus-orangepi-zero.dtb \
20@@ -372,6 +374,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ 21@@ -372,6 +374,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
21 sun8i-h3-libretech-all-h3-cc.dtb \ 22 sun8i-h3-libretech-all-h3-cc.dtb \
22 sun8i-h3-nanopi-m1.dtb \ 23 sun8i-h3-nanopi-m1.dtb \
23 sun8i-h3-nanopi-m1-plus.dtb \ 24 sun8i-h3-nanopi-m1-plus.dtb \
24+ sun8i-h3-nanopi-r1.dtb \ 25+ sun8i-h3-nanopi-r1.dtb \
25+ sun8i-h3-nanopi-duo2.dtb \ 26+ sun8i-h3-nanopi-duo2.dtb \
26 sun8i-h3-nanopi-neo.dtb \ 27 sun8i-h3-nanopi-neo.dtb \
27 sun8i-h3-nanopi-neo-air.dtb \ 28 sun8i-h3-nanopi-neo-air.dtb \
28 sun8i-h3-orangepi-2.dtb \ 29 sun8i-h3-orangepi-2.dtb \
 30@@ -396,6 +400,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
 31 sun50i-h5-orangepi-zero-plus2.dtb
 32 dtb-$(CONFIG_MACH_SUN50I_H6) += \
 33 sun50i-h6-orangepi-one-plus.dtb \
 34+ sun50i-h6-orangepi-lite2.dtb \
 35 sun50i-h6-pine-h64.dtb
 36 dtb-$(CONFIG_MACH_SUN50I) += \
 37 sun50i-a64-amarula-relic.dtb \

File Added: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h6-orangepi-one-plus.dts
$NetBSD: patch-arch_arm_dts_sun50i-h6-orangepi-one-plus.dts,v 1.1 2020/04/04 15:20:35 thorpej Exp $

Add device tree for the OrangePi Lite 2.

--- /dev/null	2020-03-25 00:28:05.000000000 +0000
+++ arch/arm/dts/sun50i-h6-orangepi-lite2.dts
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2018 Amarula Solutions
+ * Author: Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "OrangePi Lite 2";
+	compatible = "xunlong,orangepi-lite2", "allwinner,sun50i-h6";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins>;
+	vmmc-supply = <&reg_cldo1>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	bus-width = <4>;
+	status = "okay";
+};
+
+&r_i2c {
+	status = "okay";
+
+	axp805: pmic@36 {
+		compatible = "x-powers,axp805", "x-powers,axp806";
+		reg = <0x36>;
+		interrupt-parent = <&r_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		x-powers,self-working-mode;
+
+		regulators {
+			reg_aldo1: aldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-pl";
+			};
+
+			reg_aldo2: aldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-ac200";
+			};
+
+			reg_aldo3: aldo3 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc25-dram";
+			};
+
+			reg_bldo1: bldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-bias-pll";
+			};
+
+			reg_bldo2: bldo2 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-efuse-pcie-hdmi-io";
+			};
+
+			reg_bldo3: bldo3 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc-dcxoio";
+			};
+
+			bldo4 {
+				/* unused */
+			};
+
+			reg_cldo1: cldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-3v3";
+			};
+
+			reg_cldo2: cldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-wifi-1";
+			};
+
+			reg_cldo3: cldo3 {
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-wifi-2";
+			};
+
+			reg_dcdca: dcdca {
+				regulator-always-on;
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <1160000>;
+				regulator-name = "vdd-cpu";
+			};
+
+			reg_dcdcc: dcdcc {
+				regulator-min-microvolt = <810000>;
+				regulator-max-microvolt = <1080000>;
+				regulator-name = "vdd-gpu";
+			};
+
+			reg_dcdcd: dcdcd {
+				regulator-always-on;
+				regulator-min-microvolt = <960000>;
+				regulator-max-microvolt = <960000>;
+				regulator-name = "vdd-sys";
+			};
+
+			reg_dcdce: dcdce {
+				regulator-always-on;
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-name = "vcc-dram";
+			};
+
+			sw {
+				/* unused */
+			};
+		};
+	};
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_ph_pins>;
+	status = "okay";
+};

File Added: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_include_asm_arch-sunxi_cpu_sun50i_h6.h
$NetBSD: patch-arch_arm_include_asm_arch-sunxi_cpu_sun50i_h6.h,v 1.1 2020/04/04 15:20:35 thorpej Exp $

Define SUNXI_R_WDOG_BASE; used for an H6-specific workaround for a
broken watchdog timer which breaks reboot/reset.

--- arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h.orig	2020-03-27 00:39:23.000000000 +0000
+++ arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h
@@ -60,6 +60,7 @@
 #define SUNXI_RTC_BASE			0x07000000
 #define SUNXI_R_CPUCFG_BASE		0x07000400
 #define SUNXI_PRCM_BASE			0x07010000
+#define SUNXI_R_WDOG_BASE		0x07020400
 #define SUNXI_R_PIO_BASE		0x07022000
 #define SUNXI_R_UART_BASE		0x07080000
 #define SUNXI_R_TWI_BASE		0x07081400

File Added: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_mach-sunxi_board.c
$NetBSD: patch-arch_arm_mach-sunxi_board.c,v 1.1 2020/04/04 15:20:35 thorpej Exp $

H6-specific workaround for a broken watchdog timer which breaks
reboot/reset.  Use R_WDOG instead.

--- arch/arm/mach-sunxi/board.c.orig	2020-03-27 00:42:23.478886897 +0000
+++ arch/arm/mach-sunxi/board.c	2020-03-27 00:46:14.553859057 +0000
@@ -287,8 +287,14 @@ void reset_cpu(ulong addr)
 		writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode);
 	}
 #elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_MACH_SUN50I_H6)
+#if defined(CONFIG_MACH_SUN50I_H6)
+	/* WDOG is broken for H6 use the R_WDOG instead */
+	static const struct sunxi_wdog *wdog =
+		 (struct sunxi_wdog *)SUNXI_R_WDOG_BASE;
+#else
 	static const struct sunxi_wdog *wdog =
 		 ((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog;
+#endif
 
 	/* Set the watchdog for its shortest interval (.5s) and wait */
 	writel(WDT_CFG_RESET, &wdog->cfg);

File Added: pkgsrc/sysutils/u-boot/patches/patch-configs_orangepi_lite2_defconfig
$NetBSD: patch-configs_orangepi_lite2_defconfig,v 1.1 2020/04/04 15:20:35 thorpej Exp $

Add orangepi_lite2_defconfig.

--- /dev/null	2020-03-25 00:30:06.000000000 +0000
+++ configs/orangepi_lite2_defconfig
@@ -0,0 +1,17 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H6=y
+CONFIG_SUNXI_DRAM_H6_LPDDR3=y
+CONFIG_SUNXI_DRAM_DDR3=n
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MMC0_CD_PIN="PF6"
+CONFIG_HDMI_DDC_EN="PH2"
+# CONFIG_PSCI_RESET is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-lite2"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set