[pkgsrc/trunk]: pkgsrc/sysutils/u-boot-bananapi-r2 Update to u-boot-2020.04.

[thorpej <thorpej%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a6910be0925
branches:  trunk
changeset: 434698:0a6910be0925
user:      thorpej <thorpej%pkgsrc.org@localhost>
date:      Sat Jun 20 17:42:34 2020 +0000

description:
Update to u-boot-2020.04.

diffstat:

 sysutils/u-boot-bananapi-r2/Makefile                               |   6 +-
 sysutils/u-boot-bananapi-r2/distinfo                               |  15 +--
 sysutils/u-boot-bananapi-r2/patches/patch-Makefile                 |  15 ---
 sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h |  12 +-
 sysutils/u-boot-bananapi-r2/patches/patch-include_image.h          |  37 +++++++++
 sysutils/u-boot-bananapi-r2/patches/patch-lib_bch.c                |  39 ----------
 6 files changed, 52 insertions(+), 72 deletions(-)

diffs (179 lines):

diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/Makefile
--- a/sysutils/u-boot-bananapi-r2/Makefile      Sat Jun 20 17:19:37 2020 +0000
+++ b/sysutils/u-boot-bananapi-r2/Makefile      Sat Jun 20 17:42:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/06/20 17:19:37 thorpej Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/20 17:42:34 thorpej Exp $
 
 UBOOT_TARGET=          bananapi-r2
 UBOOT_CONFIG=          mt7623n_bpir2_defconfig
@@ -6,9 +6,7 @@
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-PKGREVISION=           4
-
-UBOOT_VERSION=         2019.04-rc4
+UBOOT_VERSION=         2020.04
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-bananapi-r2/patches
diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/distinfo
--- a/sysutils/u-boot-bananapi-r2/distinfo      Sat Jun 20 17:19:37 2020 +0000
+++ b/sysutils/u-boot-bananapi-r2/distinfo      Sat Jun 20 17:42:34 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2020/06/20 17:19:37 thorpej Exp $
+$NetBSD: distinfo,v 1.4 2020/06/20 17:42:34 thorpej Exp $
 
 SHA1 (BPI-R2-HEAD1-512b.img) = ef5ae9707d39654b8d931a0bd8c0825318591e69
 RMD160 (BPI-R2-HEAD1-512b.img) = 098f7c260353034a3d286d2113698c16605cd4b4
@@ -12,10 +12,9 @@
 RMD160 (preloader_iotg7623Np1_sd_1600M.bin) = bd13434a35e35ef334fb713ea5d2caec7ca0f663
 SHA512 (preloader_iotg7623Np1_sd_1600M.bin) = 5a5f580956ed9cc558c4b8b75f9dbeba6299d9950bbdbae8f5064d1d60ae7cb42ff89c9dd7f1bddebb955183780f88a731d8c2b71d61970c07e8356a9cc093a5
 Size (preloader_iotg7623Np1_sd_1600M.bin) = 91996 bytes
-SHA1 (u-boot-2019.04-rc4.tar.bz2) = 40bd6eb58ae0048da4221e28ec5fe98d6f4987f9
-RMD160 (u-boot-2019.04-rc4.tar.bz2) = 67c1b0effa8eb18872ed3608dd99c9ed521dc2b2
-SHA512 (u-boot-2019.04-rc4.tar.bz2) = 33a57e4acb51dbe04123055b159a5b3a933ea8340aa81a4148572ee5fc12288413a6c6c0b80b6fe099ac79ea6359be2d9034ead1edfcc0403895f3f8eb56746e
-Size (u-boot-2019.04-rc4.tar.bz2) = 13616834 bytes
-SHA1 (patch-Makefile) = b64ed7e0eac7299e9c621e32b4afb976c8dfda5a
-SHA1 (patch-include_configs_mt7623.h) = 3f4985844a753dac03834a14366fd76234ab6574
-SHA1 (patch-lib_bch.c) = 151e5f311742a7da919359950ccac2521bcfaaff
+SHA1 (u-boot-2020.04.tar.bz2) = 0821ce2dac9bbd9ec5883779ddad78b8610366e3
+RMD160 (u-boot-2020.04.tar.bz2) = 8f13836ea4d9d7235aa83f6b713b76e047ce27f1
+SHA512 (u-boot-2020.04.tar.bz2) = e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
+Size (u-boot-2020.04.tar.bz2) = 15065656 bytes
+SHA1 (patch-include_configs_mt7623.h) = 47cf1bd28c15fb54fd86e135afbaf1495c5acbb1
+SHA1 (patch-include_image.h) = 46f9efc0b9bbeea407e18f2b7e02b265dc0b58e1
diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/patches/patch-Makefile
--- a/sysutils/u-boot-bananapi-r2/patches/patch-Makefile        Sat Jun 20 17:19:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2019/03/24 20:50:10 thorpej Exp $
-
-u-boot: Fix name of python2 interpreter when built in pkgsrc environment
-
---- Makefile.orig      2019-03-24 19:18:59.903169960 +0000
-+++ Makefile
-@@ -359,7 +359,7 @@ YACC               = bison
- AWK           = awk
- PERL          = perl
- PYTHON                ?= python
--PYTHON2               = python2
-+PYTHON2               = python2.7
- PYTHON3               = python3
- DTC           ?= $(objtree)/scripts/dtc/dtc
- CHECK         = sparse
diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h
--- a/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h        Sat Jun 20 17:19:37 2020 +0000
+++ b/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h        Sat Jun 20 17:42:34 2020 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-include_configs_mt7623.h,v 1.1 2020/06/20 17:19:37 thorpej Exp $
+$NetBSD: patch-include_configs_mt7623.h,v 1.2 2020/06/20 17:42:34 thorpej Exp $
 
 Set the bootm_size, kernel_addr_r, fdt_addr_r, scriptaddr, pxefile_addr_r,
 ramdisk_addr_r, and fdtfile environment varibles.
 
---- include/configs/mt7623.h.orig      2019-05-20 21:48:27.989085653 -0700
-+++ include/configs/mt7623.h   2019-05-20 21:59:17.210366023 -0700
-@@ -45,14 +45,39 @@
- #define CONFIG_SUPPORT_EMMC_BOOT
+--- include/configs/mt7623.h.orig      2020-04-13 15:02:18.000000000 +0000
++++ include/configs/mt7623.h   2020-06-20 17:33:23.538928996 +0000
+@@ -42,14 +42,39 @@
+ #define MMC_SUPPORTS_TUNING
  
  /* DRAM */
 +#define SDRAM_OFFSET(x) 0x8##x
@@ -15,7 +15,7 @@
  /* This is needed for kernel booting */
  #define FDT_HIGH                      "fdt_high=0xac000000\0"
  
-+/*      
++/*
 + * 128M RAM (256M minimum minus 64MB heap + 64MB for u-boot, stack, fb, etc.
 + * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
 + * 1M script, 1M pxe and the ramdisk at the end.
diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/patches/patch-include_image.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-bananapi-r2/patches/patch-include_image.h Sat Jun 20 17:42:34 2020 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-include_image.h,v 1.1 2020/06/20 17:42:34 thorpej Exp $
+
+Ensure the correct byte order macros are used when image.h is included
+in a host tool.
+
+--- include/image.h.orig       2020-06-20 13:48:00.000000000 +0000
++++ include/image.h    2020-06-20 13:51:12.000000000 +0000
+@@ -16,7 +16,6 @@
+ #define __IMAGE_H__
+ 
+ #include "compiler.h"
+-#include <asm/byteorder.h>
+ #include <stdbool.h>
+ 
+ /* Define this to avoid #ifdefs later on */
+@@ -26,6 +25,13 @@ struct fdt_region;
+ #ifdef USE_HOSTCC
+ #include <sys/types.h>
+ 
++#include <endian.h>
++#if _BYTE_ORDER == _BIG_ENDIAN
++#  include <linux/byteorder/big_endian.h>
++#else
++#  include <linux/byteorder/little_endian.h>
++#endif
++
+ /* new uImage format support enabled on host */
+ #define IMAGE_ENABLE_FIT      1
+ #define IMAGE_ENABLE_OF_LIBFDT        1
+@@ -40,6 +46,7 @@ struct fdt_region;
+ 
+ #else
+ 
++#include <asm/byteorder.h>
+ #include <lmb.h>
+ #include <asm/u-boot.h>
+ #include <command.h>
diff -r 3dad95b5b4f4 -r 0a6910be0925 sysutils/u-boot-bananapi-r2/patches/patch-lib_bch.c
--- a/sysutils/u-boot-bananapi-r2/patches/patch-lib_bch.c       Sat Jun 20 17:19:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-lib_bch.c,v 1.1 2019/03/24 20:50:10 thorpej Exp $
-
-u-boot: fix build on macos
-
---- lib/bch.c.orig     2018-08-06 22:28:00.000000000 +0000
-+++ lib/bch.c
-@@ -61,8 +61,10 @@
- #include <linux/bitops.h>
- #else
- #include <errno.h>
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/endian.h>
-+#elif defined(__APPLE__)
-+#include <machine/endian.h>
- #else
- #include <endian.h>
- #endif
-@@ -71,7 +73,11 @@
- #include <string.h>
- 
- #undef cpu_to_be32
-+#if defined(__APPLE__)
-+#define cpu_to_be32 htonl
-+#else
- #define cpu_to_be32 htobe32
-+#endif
- #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
- #define kmalloc(size, flags)  malloc(size)
- #define kzalloc(size, flags)  calloc(1, size)
-@@ -117,7 +123,7 @@ struct gf_poly_deg1 {
- };
- 
- #ifdef USE_HOSTCC
--#if !defined(__DragonFly__) && !defined(__FreeBSD__)
-+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
- static int fls(int x)
- {
-       int r = 32;