Call cleanup_before_linux in efi_exit_boot so ensure caches are clean, etc

Bump PKGREVISION

34 files changed, 80 insertions, 64 deletions

diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile
index 0485537251e..a0d94c0b874 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.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:27 skrll Exp $
 
 UBOOT_TARGET=		a10-olinuxino-lime
 UBOOT_CONFIG=		A10-OLinuXino-Lime_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 1d73d623586..8a66b456d38 100644
--- a/sysutils/u-boot-bananapi-m3/Makefile
+++ b/sysutils/u-boot-bananapi-m3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		bananapi-m3
 UBOOT_CONFIG=		Sinovoip_BPI_M3_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 72dfbd7fdc8..5bc5f92625f 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		bananapi
 UBOOT_CONFIG=		Bananapi_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beagleboard/Makefile b/sysutils/u-boot-beagleboard/Makefile
index dad54597cda..447ee60df42 100644
--- a/sysutils/u-boot-beagleboard/Makefile
+++ b/sysutils/u-boot-beagleboard/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		beagleboard
 UBOOT_CONFIG=		omap3_beagle_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beagleboneblack/Makefile b/sysutils/u-boot-beagleboneblack/Makefile
index 269dd4f074d..963c7a049c0 100644
--- a/sysutils/u-boot-beagleboneblack/Makefile
+++ b/sysutils/u-boot-beagleboneblack/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		beagleboneblack
 UBOOT_CONFIG=		am335x_boneblack_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beaglebonewhite/Makefile b/sysutils/u-boot-beaglebonewhite/Makefile
index c103160450b..bc80876c036 100644
--- a/sysutils/u-boot-beaglebonewhite/Makefile
+++ b/sysutils/u-boot-beaglebonewhite/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		beaglebonewhite
 UBOOT_CONFIG=		am335x_evm_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 ea79f2ba4da..e20de750004 100644
--- a/sysutils/u-boot-chip-pro/Makefile
+++ b/sysutils/u-boot-chip-pro/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		chip-pro
 UBOOT_CONFIG=		CHIP_pro_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index af481527224..6ad630edb1a 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		chip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 14c9b5b91ab..d95f19c6797 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		cubieboard2
 UBOOT_CONFIG=		Cubieboard2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile
index d15de060ea8..c16296e5c9e 100644
--- a/sysutils/u-boot-cubieboard4/Makefile
+++ b/sysutils/u-boot-cubieboard4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		cubieboard4
 UBOOT_CONFIG=		Cubieboard4_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile
index a79414549ff..4dd9dde2783 100644
--- a/sysutils/u-boot-cubietruck/Makefile
+++ b/sysutils/u-boot-cubietruck/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		cubietruck
 UBOOT_CONFIG=		Cubietruck_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 e4242809b21..0abb725aa54 100644
--- a/sysutils/u-boot-de0-nanosoc/Makefile
+++ b/sysutils/u-boot-de0-nanosoc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
 
 UBOOT_TARGET=		de0-nanosoc
 UBOOT_CONFIG=		socfpga_de0_nano_soc_defconfig
 UBOOT_BIN=		u-boot-with-spl.sfp
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 042f042cf9c..fbfe783558f 100644
--- a/sysutils/u-boot-hummingbird-a31/Makefile
+++ b/sysutils/u-boot-hummingbird-a31/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		hummingbird-a31
 UBOOT_CONFIG=		Hummingbird_A31_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 564c9b33d77..ed110bb2535 100644
--- a/sysutils/u-boot-jetson-tk1/Makefile
+++ b/sysutils/u-boot-jetson-tk1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		jetson-tk1
 UBOOT_CONFIG=		jetson-tk1_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 06ed42e6921..83547c22de2 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.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-jetson-tx2/Makefile b/sysutils/u-boot-jetson-tx2/Makefile
index b9367d42753..f4aa6362bd0 100644
--- a/sysutils/u-boot-jetson-tx2/Makefile
+++ b/sysutils/u-boot-jetson-tx2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		jetson-tx2
 UBOOT_CONFIG=		p2771-0000-500_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.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-libretech-cc/Makefile b/sysutils/u-boot-libretech-cc/Makefile
index 00b50b61cc9..fd1b0a9a853 100644
--- a/sysutils/u-boot-libretech-cc/Makefile
+++ b/sysutils/u-boot-libretech-cc/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2019/04/19 10:39:53 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		libretech-cc
 UBOOT_CONFIG=		${UBOOT_TARGET}_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-nanopi-m1/Makefile b/sysutils/u-boot-nanopi-m1/Makefile
index 63556ca63c3..7e037bd0766 100644
--- a/sysutils/u-boot-nanopi-m1/Makefile
+++ b/sysutils/u-boot-nanopi-m1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		nanopi-m1
 UBOOT_CONFIG=		nanopi_m1_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 4e6a087c8e8..b707f2f1fba 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.8 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 # 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 318bfa9e6c1..068ea41dfc9 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		nanopi-neo
 UBOOT_CONFIG=		nanopi_neo_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 b661f17f2bc..f44c8fe52cc 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 # 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 97a0c86246c..30b25486d42 100644
--- a/sysutils/u-boot-odroid-c2/Makefile
+++ b/sysutils/u-boot-odroid-c2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2019/04/12 07:08:17 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		odroid-c2
 UBOOT_CONFIG=		odroid-c2_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .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 a3ecf6ea0d2..d1200309c81 100644
--- a/sysutils/u-boot-odroid-xu3/Makefile
+++ b/sysutils/u-boot-odroid-xu3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:29 skrll Exp $
 
 UBOOT_TARGET=		odroid-xu3
 UBOOT_CONFIG=		odroid-xu3_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 ed27533ca88..69f2ea1c92f 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		orangepi-2
 UBOOT_CONFIG=		orangepi_2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 3a111a4b238..82dec8c539e 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		orangepi-one
 UBOOT_CONFIG=		orangepi_one_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 97004b55d4d..54b2b6acc6a 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		orangepi-plus2e
 UBOOT_CONFIG=		orangepi_plus2e_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 0ffaecf111d..46c567382b0 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.4 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		orangepi-zero-plus
 UBOOT_CONFIG=		orangepi_zero_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 # 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 dc50b98f0d6..dad88a5ec37 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		orangepi-zero
 UBOOT_CONFIG=		orangepi_zero_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .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 84a62be4495..639a8eacec4 100644
--- a/sysutils/u-boot-pine-h64/Makefile
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		pine-h64
 UBOOT_CONFIG=		pine_h64_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 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 78691846dc2..0123cec1a16 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 # 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 c1a7e5d32cc..2864336b789 100644
--- a/sysutils/u-boot-pocketchip/Makefile
+++ b/sysutils/u-boot-pocketchip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:30 skrll Exp $
 
 UBOOT_TARGET=		pocketchip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 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 9ffe816a237..9fcb052b6a0 100644
--- a/sysutils/u-boot-sopine-baseboard/Makefile
+++ b/sysutils/u-boot-sopine-baseboard/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2019/04/12 07:08:18 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:30 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=		3
+PKGREVISION=		4
 
 # 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 eaa5547762f..e8b3206e086 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2019/04/12 07:08:15 skrll Exp $
+$NetBSD: distinfo,v 1.22 2019/04/26 08:32:27 skrll Exp $
 
 SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
@@ -13,5 +13,6 @@ 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__boottime.c) = 66aa3b95470a737154e6e082447aed0078092047
 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-lib_efi__loader_efi__boottime.c b/sysutils/u-boot/patches/patch-lib_efi__loader_efi__boottime.c
new file mode 100644
index 00000000000..7ed7be3f477
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-lib_efi__loader_efi__boottime.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_efi__loader_efi__boottime.c,v 1.1 2019/04/26 08:32:27 skrll Exp $
+
+--- lib/efi_loader/efi_boottime.c.orig	2018-11-14 16:10:06.000000000 +0000
++++ lib/efi_loader/efi_boottime.c
+@@ -1838,6 +1838,8 @@ static efi_status_t EFIAPI efi_exit_boot
+ 
+ 	board_quiesce_devices();
+ 
++	cleanup_before_linux();
++
+ 	/* This stops all lingering devices */
+ 	bootm_disable_interrupts();
+