u-boot-nanopi-r2s: Use official u-boot version

[snow flurry <snow%datagirl.xyz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	snow flurry <snow%datagirl.xyz@localhost>
Pushed By:	flurry
Date:		Sun Apr 18 15:48:25 2021 -0700
Changeset:	f5a40ef6c23d5eb38934cec84b6ca7041ac15841

Modified Files:
	u-boot-nanopi-r2s/Makefile
	u-boot-nanopi-r2s/distinfo

Log Message:
u-boot-nanopi-r2s: Use official u-boot version

Upstream u-boot supports the NanoPi R2S as of at least 2021.04.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f5a40ef6c23d5eb38934cec84b6ca7041ac15841

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 u-boot-nanopi-r2s/Makefile | 6 +-----
 u-boot-nanopi-r2s/distinfo | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs:
diff --git a/u-boot-nanopi-r2s/Makefile b/u-boot-nanopi-r2s/Makefile
index 810d4ae214..a901dba2ac 100644
--- a/u-boot-nanopi-r2s/Makefile
+++ b/u-boot-nanopi-r2s/Makefile
@@ -6,15 +6,11 @@ UBOOT_BIN=		u-boot-rockchip.bin
 
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
-UBOOT_VERSION=		2020.07
-MASTER_SITES=		${MASTER_SITE_GITHUB:=blocktrron/}
-GITHUB_PROJECT=		uboot-nanopi-r2s
-GITHUB_TAG=		b8c2aded187e23779a9f565d3577cd46027f0946
+UBOOT_VERSION=		2021.04
 
 DISTINFO_FILE=		${.CURDIR}/../../wip/u-boot-nanopi-r2s/distinfo
 PATCHDIR=		${.CURDIR}/../../wip/u-boot-nanopi-r2s/patches
 DISTFILES=		${DEFAULT_DISTFILES}
-EXTRACT_SUFX=		.tar.gz # keep
 
 # This could be moved to u-boot.mk as long as we don't have support for
 # any imx8 boards.
diff --git a/u-boot-nanopi-r2s/distinfo b/u-boot-nanopi-r2s/distinfo
index 232d9ef2b8..339baf614a 100644
--- a/u-boot-nanopi-r2s/distinfo
+++ b/u-boot-nanopi-r2s/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2020/06/30 14:40:05 thorpej Exp $
 
-SHA1 (u-boot-2020.07-b8c2aded187e23779a9f565d3577cd46027f0946.tar.gz) = bfb3012d6a9c8f3f4c607966c928bed707e2f339
-RMD160 (u-boot-2020.07-b8c2aded187e23779a9f565d3577cd46027f0946.tar.gz) = ace45cd6c0eed70675690ae22456b6da32fca30f
-SHA512 (u-boot-2020.07-b8c2aded187e23779a9f565d3577cd46027f0946.tar.gz) = 6c45cb274132b3b4acb8c17e00b29e7c9106b57b05d861a408abdee083ab499ee67ecc9eaafc9082e1c07b4f431e790ad810abae7574b0a82043a7830a56dc96
-Size (u-boot-2020.07-b8c2aded187e23779a9f565d3577cd46027f0946.tar.gz) = 19693336 bytes
+SHA1 (u-boot-2021.04.tar.bz2) = a69cf9cf8ddda0935b0bfed86e90fde1124f133d
+RMD160 (u-boot-2021.04.tar.bz2) = 4834e300f5490a0af08209018aac25a1b3a8d5cb
+SHA512 (u-boot-2021.04.tar.bz2) = c24835a520bfd528032614576ca552e55e6de129372e72e22e80e0d45dc5c1c75aa4aad80e856d5bbd7146ec092cac52a6f352253cf3fdf9fe536f5e87782803
+Size (u-boot-2021.04.tar.bz2) = 16673334 bytes
 SHA1 (patch-include_image.h) = 46f9efc0b9bbeea407e18f2b7e02b265dc0b58e1