Backport a patch from u-boot mainline to support EFI GetVariable.

Add PKGREVISION to the UBOOT_VERSTION output

Bump PKGREVISION for all 2018.11 packages

35 files changed, 361 insertions, 63 deletions

diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile
index e237796a114..0485537251e 100644
--- a/sysutils/u-boot-a10-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-bananapi-m3/Makefile b/sysutils/u-boot-bananapi-m3/Makefile
index e071568c148..1d73d623586 100644
--- a/sysutils/u-boot-bananapi-m3/Makefile
+++ b/sysutils/u-boot-bananapi-m3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 0c932959dc4..72dfbd7fdc8 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-beagleboard/Makefile b/sysutils/u-boot-beagleboard/Makefile
index 612de46ae40..dad54597cda 100644
--- a/sysutils/u-boot-beagleboard/Makefile
+++ b/sysutils/u-boot-beagleboard/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $
 
 UBOOT_TARGET=		beagleboard
 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"
diff --git a/sysutils/u-boot-beagleboneblack/Makefile b/sysutils/u-boot-beagleboneblack/Makefile
index b990296d95a..269dd4f074d 100644
--- a/sysutils/u-boot-beagleboneblack/Makefile
+++ b/sysutils/u-boot-beagleboneblack/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/12 07:08:16 skrll Exp $
 
 UBOOT_TARGET=		beagleboneblack
 UBOOT_CONFIG=		am335x_boneblack_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beaglebonewhite/Makefile b/sysutils/u-boot-beaglebonewhite/Makefile
index dc7100b8c39..c103160450b 100644
--- a/sysutils/u-boot-beaglebonewhite/Makefile
+++ b/sysutils/u-boot-beaglebonewhite/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $
 
 UBOOT_TARGET=		beaglebonewhite
 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"
diff --git a/sysutils/u-boot-chip-pro/Makefile b/sysutils/u-boot-chip-pro/Makefile
index f541ea0388b..ea79f2ba4da 100644
--- a/sysutils/u-boot-chip-pro/Makefile
+++ b/sysutils/u-boot-chip-pro/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index fb8577794d3..af481527224 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 64952d05921..14c9b5b91ab 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile
index 501130606b1..d15de060ea8 100644
--- a/sysutils/u-boot-cubieboard4/Makefile
+++ b/sysutils/u-boot-cubieboard4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile
index 0e52028380e..a79414549ff 100644
--- a/sysutils/u-boot-cubietruck/Makefile
+++ b/sysutils/u-boot-cubietruck/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-de0-nanosoc/Makefile b/sysutils/u-boot-de0-nanosoc/Makefile
index 8c5d04d53e0..e4242809b21 100644
--- a/sysutils/u-boot-de0-nanosoc/Makefile
+++ b/sysutils/u-boot-de0-nanosoc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-hummingbird-a31/Makefile b/sysutils/u-boot-hummingbird-a31/Makefile
index 55d229437c6..042f042cf9c 100644
--- a/sysutils/u-boot-hummingbird-a31/Makefile
+++ b/sysutils/u-boot-hummingbird-a31/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-jetson-tk1/Makefile b/sysutils/u-boot-jetson-tk1/Makefile
index aea2857a1cf..564c9b33d77 100644
--- a/sysutils/u-boot-jetson-tk1/Makefile
+++ b/sysutils/u-boot-jetson-tk1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-jetson-tx1/Makefile b/sysutils/u-boot-jetson-tx1/Makefile
index a480115f15f..06ed42e6921 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-jetson-tx2/Makefile b/sysutils/u-boot-jetson-tx2/Makefile
index 782d7b13f5b..b9367d42753 100644
--- a/sysutils/u-boot-jetson-tx2/Makefile
+++ b/sysutils/u-boot-jetson-tx2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-nanopi-m1/Makefile b/sysutils/u-boot-nanopi-m1/Makefile
index c8339aef8e3..63556ca63c3 100644
--- a/sysutils/u-boot-nanopi-m1/Makefile
+++ b/sysutils/u-boot-nanopi-m1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile
index e5a6e264f85..4e6a087c8e8 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/03/15 13:58:59 martin Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/12 07:08:17 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index da97832a147..318bfa9e6c1 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index b80081c65fa..b661f17f2bc 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2019/03/15 13:59:38 martin Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-odroid-c2/Makefile b/sysutils/u-boot-odroid-c2/Makefile
index 6f7b1be683a..97a0c86246c 100644
--- a/sysutils/u-boot-odroid-c2/Makefile
+++ b/sysutils/u-boot-odroid-c2/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2019/01/22 17:17:55 martin Exp $
+# $NetBSD: Makefile,v 1.2 2019/04/12 07:08:17 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-odroid-xu3/Makefile b/sysutils/u-boot-odroid-xu3/Makefile
index 0d6f2f0c4b9..a3ecf6ea0d2 100644
--- a/sysutils/u-boot-odroid-xu3/Makefile
+++ b/sysutils/u-boot-odroid-xu3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-orangepi-2/Makefile b/sysutils/u-boot-orangepi-2/Makefile
index bfa6f892883..ed27533ca88 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile
index 4c80a5c0a87..3a111a4b238 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-orangepi-plus2e/Makefile b/sysutils/u-boot-orangepi-plus2e/Makefile
index 86538b4a66c..97004b55d4d 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-orangepi-zero-plus/Makefile b/sysutils/u-boot-orangepi-zero-plus/Makefile
index dba3e05510e..0ffaecf111d 100644
--- a/sysutils/u-boot-orangepi-zero-plus/Makefile
+++ b/sysutils/u-boot-orangepi-zero-plus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/03/15 13:59:58 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/12 07:08:18 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile
index b52775e5aa1..dc50b98f0d6 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $
 
 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"
diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile
index ff8a1fafbe3..84a62be4495 100644
--- a/sysutils/u-boot-pine-h64/Makefile
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $
 
 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}
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 7455b2caafb..78691846dc2 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/03/15 14:00:36 martin Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/12 07:08:18 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-pocketchip/Makefile b/sysutils/u-boot-pocketchip/Makefile
index 14507754605..c1a7e5d32cc 100644
--- a/sysutils/u-boot-pocketchip/Makefile
+++ b/sysutils/u-boot-pocketchip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:18 skrll Exp $
 
 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
diff --git a/sysutils/u-boot-sopine-baseboard/Makefile b/sysutils/u-boot-sopine-baseboard/Makefile
index 9ba26984410..9ffe816a237 100644
--- a/sysutils/u-boot-sopine-baseboard/Makefile
+++ b/sysutils/u-boot-sopine-baseboard/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/03/15 14:01:00 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/12 07:08:18 skrll Exp $
 
 UBOOT_TARGET=		sopine-baseboard
 UBOOT_CONFIG=		sopine_baseboard_defconfig
 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
diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
index 58a62d09365..eaa5547762f 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.20 2019/01/03 04:07:18 thorpej Exp $
+$NetBSD: distinfo,v 1.21 2019/04/12 07:08:15 skrll Exp $
 
 SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
 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-post.h) = dfc081d2a3f7cd32e340b03f6c77c
 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
diff --git a/sysutils/u-boot/patches/patch-Makefile b/sysutils/u-boot/patches/patch-Makefile
new file mode 100644
index 00000000000..9f4dc05dba5
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile,v 1.1 2019/04/12 07:08:15 skrll Exp $
+
+--- 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
diff --git a/sysutils/u-boot/patches/patch-lib_efi__loader_efi__variable.c b/sysutils/u-boot/patches/patch-lib_efi__loader_efi__variable.c
new file mode 100644
index 00000000000..200e89e4607
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-lib_efi__loader_efi__variable.c
@@ -0,0 +1,277 @@
+$NetBSD: patch-lib_efi__loader_efi__variable.c,v 1.1 2019/04/12 07:08:15 skrll Exp $
+
+--- 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)
diff --git a/sysutils/u-boot/u-boot.mk b/sysutils/u-boot/u-boot.mk
index 6fadfdb9bb8..a422c7556ed 100644
--- a/sysutils/u-boot/u-boot.mk
+++ b/sysutils/u-boot/u-boot.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.13 2019/03/24 14:57:47 tnn Exp $
+# $NetBSD: u-boot.mk,v 1.14 2019/04/12 07:08:15 skrll Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -31,6 +31,10 @@ REPLACE_FILES.python2=	scripts/fill_scrapyard.py \
 			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: