? u-boot-hummingboard
Index: u-boot/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- u-boot/distinfo	3 Jan 2019 04:07:18 -0000	1.20
+++ u-boot/distinfo	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,7 @@ SHA1 (u-boot-2018.11.tar.bz2) = e58e86c6
 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
 SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
 Size (u-boot-2018.11.tar.bz2) = 13045125 bytes
+SHA1 (patch-Makefile) = 45f505041a586b75953c34c1ab6fffaa56b43601
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
 SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95
 SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c
@@ -12,4 +13,5 @@ SHA1 (patch-include_configs_tegra-common
 SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
 SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe
 SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
+SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d
 SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042
Index: u-boot/u-boot.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot/u-boot.mk,v
retrieving revision 1.13
diff -u -p -r1.13 u-boot.mk
--- u-boot/u-boot.mk	24 Mar 2019 14:57:47 -0000	1.13
+++ u-boot/u-boot.mk	9 Apr 2019 20:11:46 -0000
@@ -31,6 +31,10 @@ REPLACE_FILES.python2=	scripts/fill_scra
 			tools/genboardscfg.py \
 			tools/moveconfig.py
 
+.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
+UBOOT_ENV+=	UBOOT_PKGREVISION=nb${PKGREVISION}
+.endif
+
 MAKE_ENV+=	${UBOOT_ENV}
 
 post-patch:
Index: u-boot/patches/patch-Makefile
===================================================================
RCS file: u-boot/patches/patch-Makefile
diff -N u-boot/patches/patch-Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ u-boot/patches/patch-Makefile	9 Apr 2019 20:11:46 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.orig	2018-11-14 16:10:06.000000000 +0000
++++ Makefile
+@@ -1472,7 +1472,7 @@ prepare: prepare0
+ 
+ define filechk_version.h
+ 	(echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \
+-	echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \
++	echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION \"$(UBOOT_PKGREVISION)\"; \
+ 	echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \
+ 	echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; )
+ endef
Index: u-boot/patches/patch-lib_efi__loader_efi__variable.c
===================================================================
RCS file: u-boot/patches/patch-lib_efi__loader_efi__variable.c
diff -N u-boot/patches/patch-lib_efi__loader_efi__variable.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ u-boot/patches/patch-lib_efi__loader_efi__variable.c	9 Apr 2019 20:11:46 -0000
@@ -0,0 +1,277 @@
+$NetBSD$
+
+--- lib/efi_loader/efi_variable.c.orig	2019-04-06 16:01:44.521947778 +0000
++++ lib/efi_loader/efi_variable.c
+@@ -8,6 +8,10 @@
+ #include <malloc.h>
+ #include <charset.h>
+ #include <efi_loader.h>
++#include <hexdump.h>
++#include <environment.h>
++#include <search.h>
++#include <uuid.h>
+ 
+ #define READ_ONLY BIT(31)
+ 
+@@ -98,6 +102,19 @@ static char *mem2hex(char *hexstr, const
+ 	return hexstr;
+ }
+ 
++/**
++ * efi_to_native() - convert the UEFI variable name and vendor GUID to U-Boot
++ *		     variable name
++ *
++ * The U-Boot variable name is a concatenation of prefix 'efi', the hexstring
++ * encoded vendor GUID, and the UTF-8 encoded UEFI variable name separated by
++ * underscores, e.g. 'efi_8be4df61-93ca-11d2-aa0d-00e098032b8c_BootOrder'.
++ *
++ * @native:		pointer to pointer to U-Boot variable name
++ * @variable_name:	UEFI variable name
++ * @vendor:		vendor GUID
++ * Return:		status code
++ */
+ static efi_status_t efi_to_native(char **native, const u16 *variable_name,
+ 				  efi_guid_t *vendor)
+ {
+@@ -116,6 +133,15 @@ static efi_status_t efi_to_native(char *
+ 	return EFI_SUCCESS;
+ }
+ 
++/**
++ * prefix() - skip over prefix
++ *
++ * Skip over a prefix string.
++ *
++ * @str:	string with prefix
++ * @prefix:	prefix string
++ * Return:	string without prefix, or NULL if prefix not found
++ */
+ static const char *prefix(const char *str, const char *prefix)
+ {
+ 	size_t n = strlen(prefix);
+@@ -124,7 +150,16 @@ static const char *prefix(const char *st
+ 	return NULL;
+ }
+ 
+-/* parse attributes part of variable value, if present: */
++/**
++ * parse_attr() - decode attributes part of variable value
++ *
++ * Convert the string encoded attributes of a UEFI variable to a bit mask.
++ * TODO: Several attributes are not supported.
++ *
++ * @str:	value of U-Boot variable
++ * @attrp:	pointer to UEFI attributes
++ * Return:	pointer to remainder of U-Boot variable value
++ */
+ static const char *parse_attr(const char *str, u32 *attrp)
+ {
+ 	u32 attr = 0;
+@@ -162,7 +197,21 @@ static const char *parse_attr(const char
+ 	return str;
+ }
+ 
+-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.29 */
++/**
++ * efi_efi_get_variable() - retrieve value of a UEFI variable
++ *
++ * This function implements the GetVariable runtime service.
++ *
++ * See the Unified Extensible Firmware Interface (UEFI) specification for
++ * details.
++ *
++ * @variable_name:	name of the variable
++ * @vendor:		vendor GUID
++ * @attributes:		attributes of the variable
++ * @data_size:		size of the buffer to which the variable value is copied
++ * @data:		buffer to which the variable value is copied
++ * Return:		status code
++ */
+ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,
+ 				     u32 *attributes, efi_uintn_t *data_size,
+ 				     void *data)
+@@ -241,17 +290,179 @@ efi_status_t EFIAPI efi_get_variable(u16
+ 	return EFI_EXIT(EFI_SUCCESS);
+ }
+ 
+-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariableName.28.29 */
++static char *efi_variables_list;
++static char *efi_cur_variable;
++
++/**
++ * parse_uboot_variable() - parse a u-boot variable and get uefi-related
++ *			    information
++ * @variable:		whole data of u-boot variable (ie. name=value)
++ * @variable_name_size: size of variable_name buffer in byte
++ * @variable_name:	name of uefi variable in u16, null-terminated
++ * @vendor:		vendor's guid
++ * @attributes:		attributes
++ *
++ * A uefi variable is encoded into a u-boot variable as described above.
++ * This function parses such a u-boot variable and retrieve uefi-related
++ * information into respective parameters. In return, variable_name_size
++ * is the size of variable name including NULL.
++ *
++ * Return:		EFI_SUCCESS if parsing is OK, EFI_NOT_FOUND when
++			the entire variable list has been returned,
++			otherwise non-zero status code
++ */
++static efi_status_t parse_uboot_variable(char *variable,
++					 efi_uintn_t *variable_name_size,
++					 u16 *variable_name,
++					 const efi_guid_t *vendor,
++					 u32 *attributes)
++{
++	char *guid, *name, *end, c;
++	unsigned long name_len;
++	u16 *p;
++
++	guid = strchr(variable, '_');
++	if (!guid)
++		return EFI_INVALID_PARAMETER;
++	guid++;
++	name = strchr(guid, '_');
++	if (!name)
++		return EFI_INVALID_PARAMETER;
++	name++;
++	end = strchr(name, '=');
++	if (!end)
++		return EFI_INVALID_PARAMETER;
++
++	name_len = end - name;
++	if (*variable_name_size < (name_len + 1)) {
++		*variable_name_size = name_len + 1;
++		return EFI_BUFFER_TOO_SMALL;
++	}
++	end++; /* point to value */
++
++	/* variable name */
++	p = variable_name;
++	utf8_utf16_strncpy(&p, name, name_len);
++	variable_name[name_len] = 0;
++	*variable_name_size = name_len + 1;
++
++	/* guid */
++	c = *(name - 1);
++	*(name - 1) = '\0'; /* guid need be null-terminated here */
++	uuid_str_to_bin(guid, (unsigned char *)vendor, UUID_STR_FORMAT_GUID);
++	*(name - 1) = c;
++
++	/* attributes */
++	parse_attr(end, attributes);
++
++	return EFI_SUCCESS;
++}
++
++/**
++ * efi_get_next_variable_name() - enumerate the current variable names
++ * @variable_name_size:	size of variable_name buffer in byte
++ * @variable_name:	name of uefi variable's name in u16
++ * @vendor:		vendor's guid
++ *
++ * This function implements the GetNextVariableName service.
++ *
++ * See the Unified Extensible Firmware Interface (UEFI) specification for
++ * details: http://wiki.phoenix.com/wiki/index.php/
++ *		EFI_RUNTIME_SERVICES#GetNextVariableName.28.29
++ *
++ * Return: status code
++ */
+ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
+-					       u16 *variable_name,
+-					       efi_guid_t *vendor)
++                                               u16 *variable_name,
++                                               efi_guid_t *vendor)
+ {
++	char *native_name, *variable;
++	ssize_t name_len, list_len;
++	char regex[256];
++	char * const regexlist[] = {regex};
++	u32 attributes;
++	int i;
++	efi_status_t ret;
++
+ 	EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor);
+ 
+-	return EFI_EXIT(EFI_DEVICE_ERROR);
++	if (!variable_name_size || !variable_name || !vendor)
++		return EFI_EXIT(EFI_INVALID_PARAMETER);
++
++	if (variable_name[0]) {
++		/* check null-terminated string */
++		for (i = 0; i < *variable_name_size; i++)
++			if (!variable_name[i])
++				break;
++		if (i >= *variable_name_size)
++			return EFI_EXIT(EFI_INVALID_PARAMETER);
++
++		/* search for the last-returned variable */
++		ret = efi_to_native(&native_name, variable_name, vendor);
++		if (ret)
++			return EFI_EXIT(ret);
++
++		name_len = strlen(native_name);
++		for (variable = efi_variables_list; variable && *variable;) {
++			if (!strncmp(variable, native_name, name_len) &&
++			    variable[name_len] == '=')
++				break;
++
++			variable = strchr(variable, '\n');
++			if (variable)
++				variable++;
++		}
++
++		free(native_name);
++		if (!(variable && *variable))
++			return EFI_EXIT(EFI_INVALID_PARAMETER);
++
++		/* next variable */
++		variable = strchr(variable, '\n');
++		if (variable)
++			variable++;
++		if (!(variable && *variable))
++			return EFI_EXIT(EFI_NOT_FOUND);
++	} else {
++		/*
++		 *new search: free a list used in the previous search
++		 */
++		free(efi_variables_list);
++		efi_variables_list = NULL;
++		efi_cur_variable = NULL;
++
++		snprintf(regex, 256, "efi_.*-.*-.*-.*-.*_.*");
++		list_len = hexport_r(&env_htab, '\n',
++				     H_MATCH_REGEX | H_MATCH_KEY,
++				     &efi_variables_list, 0, 1, regexlist);
++		/* 1 indicates that no match was found */
++		if (list_len <= 1)
++			return EFI_EXIT(EFI_NOT_FOUND);
++
++		variable = efi_variables_list;
++	}
++
++	ret = parse_uboot_variable(variable, variable_name_size, variable_name,
++				   vendor, &attributes);
++
++	return EFI_EXIT(ret);
+ }
+ 
+-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.29 */
++/**
++ * efi_efi_set_variable() - set value of a UEFI variable
++ *
++ * This function implements the SetVariable runtime service.
++ *
++ * See the Unified Extensible Firmware Interface (UEFI) specification for
++ * details.
++ *
++ * @variable_name:	name of the variable
++ * @vendor:		vendor GUID
++ * @attributes:		attributes of the variable
++ * @data_size:		size of the buffer with the variable value
++ * @data:		buffer with the variable value
++ * Return:		status code
++ */
+ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,
+ 				     u32 attributes, efi_uintn_t data_size,
+ 				     void *data)
Index: u-boot-a10-olinuxino-lime/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-a10-olinuxino-lime/Makefile	31 Dec 2018 15:06:44 -0000	1.4
+++ u-boot-a10-olinuxino-lime/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		a10-olinuxino-lime
 UBOOT_CONFIG=		A10-OLinuXino-Lime_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-bananapi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-bananapi/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-bananapi/Makefile	31 Dec 2018 15:06:44 -0000	1.4
+++ u-boot-bananapi/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		bananapi
 UBOOT_CONFIG=		Bananapi_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-bananapi-m3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-bananapi-m3/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-bananapi-m3/Makefile	31 Dec 2018 15:06:44 -0000	1.4
+++ u-boot-bananapi-m3/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		bananapi-m3
 UBOOT_CONFIG=		Sinovoip_BPI_M3_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-beagleboard/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-beagleboard/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-beagleboard/Makefile	31 Dec 2018 15:06:44 -0000	1.2
+++ u-boot-beagleboard/Makefile	9 Apr 2019 20:11:46 -0000
@@ -5,6 +5,6 @@ UBOOT_CONFIG=		omap3_beagle_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-beagleboneblack/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-beagleboneblack/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- u-boot-beagleboneblack/Makefile	31 Dec 2018 15:06:44 -0000	1.3
+++ u-boot-beagleboneblack/Makefile	9 Apr 2019 20:11:46 -0000
@@ -5,6 +5,6 @@ UBOOT_CONFIG=		am335x_boneblack_defconfi
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-beaglebonewhite/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-beaglebonewhite/Makefile	31 Dec 2018 15:06:44 -0000	1.2
+++ u-boot-beaglebonewhite/Makefile	9 Apr 2019 20:11:46 -0000
@@ -5,6 +5,6 @@ UBOOT_CONFIG=		am335x_evm_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-chip/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-chip/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-chip/Makefile	31 Dec 2018 15:06:44 -0000	1.4
+++ u-boot-chip/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		chip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-chip-pro/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-chip-pro/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-chip-pro/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-chip-pro/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		chip-pro
 UBOOT_CONFIG=		CHIP_pro_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-cubieboard2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-cubieboard2/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-cubieboard2/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-cubieboard2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		cubieboard2
 UBOOT_CONFIG=		Cubieboard2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-cubieboard4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-cubieboard4/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-cubieboard4/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-cubieboard4/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		cubieboard4
 UBOOT_CONFIG=		Cubieboard4_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-cubietruck/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-cubietruck/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-cubietruck/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-cubietruck/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		cubietruck
 UBOOT_CONFIG=		Cubietruck_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-de0-nanosoc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-de0-nanosoc/Makefile	31 Dec 2018 15:06:45 -0000	1.2
+++ u-boot-de0-nanosoc/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		de0-nanosoc
 UBOOT_CONFIG=		socfpga_de0_nano_soc_defconfig
 UBOOT_BIN=		u-boot-with-spl.sfp
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-hummingbird-a31/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-hummingbird-a31/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-hummingbird-a31/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		hummingbird-a31
 UBOOT_CONFIG=		Hummingbird_A31_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-jetson-tk1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-jetson-tk1/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- u-boot-jetson-tk1/Makefile	31 Dec 2018 15:06:45 -0000	1.5
+++ u-boot-jetson-tk1/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		jetson-tk1
 UBOOT_CONFIG=		jetson-tk1_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-jetson-tx1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-jetson-tx1/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- u-boot-jetson-tx1/Makefile	31 Dec 2018 15:06:45 -0000	1.6
+++ u-boot-jetson-tx1/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
Index: u-boot-jetson-tx2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-jetson-tx2/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-jetson-tx2/Makefile	31 Dec 2018 15:06:45 -0000	1.4
+++ u-boot-jetson-tx2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		jetson-tx2
 UBOOT_CONFIG=		p2771-0000-500_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
Index: u-boot-nanopi-m1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-nanopi-m1/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-nanopi-m1/Makefile	31 Dec 2018 15:06:45 -0000	1.2
+++ u-boot-nanopi-m1/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		nanopi-m1
 UBOOT_CONFIG=		nanopi_m1_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-nanopi-neo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-nanopi-neo/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- u-boot-nanopi-neo/Makefile	31 Dec 2018 15:06:47 -0000	1.5
+++ u-boot-nanopi-neo/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		nanopi-neo
 UBOOT_CONFIG=		nanopi_neo_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-nanopi-neo-plus2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- u-boot-nanopi-neo-plus2/Makefile	15 Mar 2019 13:58:59 -0000	1.7
+++ u-boot-nanopi-neo-plus2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 #PKG_DEFAULT_OPTIONS+=	el1
Index: u-boot-nanopi-neo2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- u-boot-nanopi-neo2/Makefile	15 Mar 2019 13:59:38 -0000	1.6
+++ u-boot-nanopi-neo2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
Index: u-boot-odroid-c2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-odroid-c2/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- u-boot-odroid-c2/Makefile	22 Jan 2019 17:17:55 -0000	1.1
+++ u-boot-odroid-c2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,4 +4,6 @@ UBOOT_TARGET=		odroid-c2
 UBOOT_CONFIG=		odroid-c2_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: u-boot-odroid-xu3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-odroid-xu3/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-odroid-xu3/Makefile	31 Dec 2018 15:06:46 -0000	1.2
+++ u-boot-odroid-xu3/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		odroid-xu3
 UBOOT_CONFIG=		odroid-xu3_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-orangepi-2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-orangepi-2/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- u-boot-orangepi-2/Makefile	31 Dec 2018 15:06:46 -0000	1.6
+++ u-boot-orangepi-2/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		orangepi-2
 UBOOT_CONFIG=		orangepi_2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-orangepi-one/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-orangepi-one/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-orangepi-one/Makefile	31 Dec 2018 15:06:46 -0000	1.4
+++ u-boot-orangepi-one/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		orangepi-one
 UBOOT_CONFIG=		orangepi_one_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-orangepi-plus2e/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- u-boot-orangepi-plus2e/Makefile	31 Dec 2018 15:06:46 -0000	1.6
+++ u-boot-orangepi-plus2e/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		orangepi-plus2e
 UBOOT_CONFIG=		orangepi_plus2e_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-orangepi-zero/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-orangepi-zero/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- u-boot-orangepi-zero/Makefile	31 Dec 2018 15:06:46 -0000	1.2
+++ u-boot-orangepi-zero/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,6 +4,6 @@ UBOOT_TARGET=		orangepi-zero
 UBOOT_CONFIG=		orangepi_zero_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
Index: u-boot-orangepi-zero-plus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- u-boot-orangepi-zero-plus/Makefile	15 Mar 2019 13:59:58 -0000	1.3
+++ u-boot-orangepi-zero-plus/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		orangepi-zero-plus
 UBOOT_CONFIG=		orangepi_zero_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=   el1
Index: u-boot-pine-h64/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-pine-h64/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- u-boot-pine-h64/Makefile	31 Dec 2018 15:06:46 -0000	1.4
+++ u-boot-pine-h64/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		pine-h64
 UBOOT_CONFIG=		pine_h64_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC}
Index: u-boot-pine64/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-pine64/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- u-boot-pine64/Makefile	15 Mar 2019 14:00:36 -0000	1.7
+++ u-boot-pine64/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
Index: u-boot-pocketchip/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-pocketchip/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- u-boot-pocketchip/Makefile	31 Dec 2018 15:06:46 -0000	1.5
+++ u-boot-pocketchip/Makefile	9 Apr 2019 20:11:46 -0000
@@ -4,7 +4,7 @@ UBOOT_TARGET=		pocketchip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 UBOOT_OPTIONS+=		CONFIG_I2C1_ENABLE=y
 UBOOT_OPTIONS+=		CONFIG_AXP_GPIO=y
Index: u-boot-sopine-baseboard/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- u-boot-sopine-baseboard/Makefile	15 Mar 2019 14:01:00 -0000	1.3
+++ u-boot-sopine-baseboard/Makefile	9 Apr 2019 20:11:46 -0000
@@ -5,7 +5,7 @@ UBOOT_CONFIG=		sopine_baseboard_defconfi
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_ENV+=		DEVICE_TREE=sun50i-a64-sopine-baseboard
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1