U-Boot 2018.11 broke compatibility of U-Boot image type IDs. Restore IDs

used in previous (and subsequent) U-Boot versions to fix booting GENERIC
armv7 NetBSD kernels.

31 files changed, 115 insertions, 31 deletions

diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile
index 39638ae0800..e237796a114 100644
--- a/sysutils/u-boot-a10-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		a10-olinuxino-lime
 UBOOT_CONFIG=		A10-OLinuXino-Lime_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 c599471b4ca..e071568c148 100644
--- a/sysutils/u-boot-bananapi-m3/Makefile
+++ b/sysutils/u-boot-bananapi-m3/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		bananapi-m3
 UBOOT_CONFIG=		Sinovoip_BPI_M3_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 80a544db1e5..0c932959dc4 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		bananapi
 UBOOT_CONFIG=		Bananapi_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beagleboard/Makefile b/sysutils/u-boot-beagleboard/Makefile
index e73b1603897..612de46ae40 100644
--- a/sysutils/u-boot-beagleboard/Makefile
+++ b/sysutils/u-boot-beagleboard/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 19:56:36 sevan Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		beagleboard
 UBOOT_CONFIG=		omap3_beagle_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beagleboneblack/Makefile b/sysutils/u-boot-beagleboneblack/Makefile
index f36891e5e08..b990296d95a 100644
--- a/sysutils/u-boot-beagleboneblack/Makefile
+++ b/sysutils/u-boot-beagleboneblack/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2017/08/26 18:46:07 sevan Exp $
+# $NetBSD: Makefile,v 1.3 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		beagleboneblack
 UBOOT_CONFIG=		am335x_boneblack_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-beaglebonewhite/Makefile b/sysutils/u-boot-beaglebonewhite/Makefile
index 118a7be8910..dc7100b8c39 100644
--- a/sysutils/u-boot-beaglebonewhite/Makefile
+++ b/sysutils/u-boot-beaglebonewhite/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 18:35:33 sevan Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		beaglebonewhite
 UBOOT_CONFIG=		am335x_evm_defconfig
 UBOOT_BIN=		u-boot.img
 UBOOT_BIN+= 		MLO
 
+PKGREVISION=		1
+
 .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 6464457d881..f541ea0388b 100644
--- a/sysutils/u-boot-chip-pro/Makefile
+++ b/sysutils/u-boot-chip-pro/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		chip-pro
 UBOOT_CONFIG=		CHIP_pro_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index 1446e713821..fb8577794d3 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=		chip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 86657b55593..64952d05921 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		cubieboard2
 UBOOT_CONFIG=		Cubieboard2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile
index 2fd2b2a4a02..501130606b1 100644
--- a/sysutils/u-boot-cubieboard4/Makefile
+++ b/sysutils/u-boot-cubieboard4/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		cubieboard4
 UBOOT_CONFIG=		Cubieboard4_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile
index 19be95ec7b5..0e52028380e 100644
--- a/sysutils/u-boot-cubietruck/Makefile
+++ b/sysutils/u-boot-cubietruck/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		cubietruck
 UBOOT_CONFIG=		Cubietruck_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 effedec1657..8c5d04d53e0 100644
--- a/sysutils/u-boot-de0-nanosoc/Makefile
+++ b/sysutils/u-boot-de0-nanosoc/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/10/14 19:25:31 aymeric Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		de0-nanosoc
 UBOOT_CONFIG=		socfpga_de0_nano_soc_defconfig
 UBOOT_BIN=		u-boot-with-spl.sfp
 
+PKGREVISION=		1
+
 .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 fc8cfcabc0c..55d229437c6 100644
--- a/sysutils/u-boot-hummingbird-a31/Makefile
+++ b/sysutils/u-boot-hummingbird-a31/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		hummingbird-a31
 UBOOT_CONFIG=		Hummingbird_A31_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 fbba12029ea..aea2857a1cf 100644
--- a/sysutils/u-boot-jetson-tk1/Makefile
+++ b/sysutils/u-boot-jetson-tk1/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/14 00:52:26 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		jetson-tk1
 UBOOT_CONFIG=		jetson-tk1_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
+PKGREVISION=		1
+
 .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 d3d034229e5..a480115f15f 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:26 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
+PKGREVISION=		1
+
 # 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 c1f9e939099..782d7b13f5b 100644
--- a/sysutils/u-boot-jetson-tx2/Makefile
+++ b/sysutils/u-boot-jetson-tx2/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		jetson-tx2
 UBOOT_CONFIG=		p2771-0000-500_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
+PKGREVISION=		1
+
 # 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 93f1b10fbe9..c8339aef8e3 100644
--- a/sysutils/u-boot-nanopi-m1/Makefile
+++ b/sysutils/u-boot-nanopi-m1/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/12/21 11:46:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		nanopi-m1
 UBOOT_CONFIG=		nanopi_m1_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 06392ac1b98..ea738eda5ef 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 # Switch to EL1 before booting kernel (required for 32-bit support)
 #PKG_DEFAULT_OPTIONS+=	el1
-PKG_DEFAULT_OPTIONS+=	debug
 
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index 79657c26b67..5b136793c4f 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=		nanopi-neo
 UBOOT_CONFIG=		nanopi_neo_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 4d4e0556ae6..0b71988e2e5 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
 
diff --git a/sysutils/u-boot-odroid-xu3/Makefile b/sysutils/u-boot-odroid-xu3/Makefile
index 19f885e0ddf..0d6f2f0c4b9 100644
--- a/sysutils/u-boot-odroid-xu3/Makefile
+++ b/sysutils/u-boot-odroid-xu3/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/10/27 10:02:13 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		odroid-xu3
 UBOOT_CONFIG=		odroid-xu3_defconfig
 UBOOT_BIN=		u-boot u-boot-dtb.bin
 
+PKGREVISION=		1
+
 .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 5239229f40b..bfa6f892883 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		orangepi-2
 UBOOT_CONFIG=		orangepi_2_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 85045ca172a..4c80a5c0a87 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		orangepi-one
 UBOOT_CONFIG=		orangepi_one_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 ca4782d6c32..86538b4a66c 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		orangepi-plus2e
 UBOOT_CONFIG=		orangepi_plus2e_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 7836a7d5310..4c521fc8ef6 100644
--- a/sysutils/u-boot-orangepi-zero-plus/Makefile
+++ b/sysutils/u-boot-orangepi-zero-plus/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2018/06/24 23:18:01 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		orangepi-zero-plus
 UBOOT_CONFIG=		orangepi_zero_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 # 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 354f4e6d824..b52775e5aa1 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/06/23 10:48:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		orangepi-zero
 UBOOT_CONFIG=		orangepi_zero_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 .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 8594f583ff2..ff8a1fafbe3 100644
--- a/sysutils/u-boot-pine-h64/Makefile
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		pine-h64
 UBOOT_CONFIG=		pine_h64_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 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 40e32416c25..0c52dabfef1 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 # 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 47fe66fda1d..14507754605 100644
--- a/sysutils/u-boot-pocketchip/Makefile
+++ b/sysutils/u-boot-pocketchip/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=		pocketchip
 UBOOT_CONFIG=		CHIP_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
+PKGREVISION=		1
+
 UBOOT_OPTIONS+=		CONFIG_I2C1_ENABLE=y
 UBOOT_OPTIONS+=		CONFIG_AXP_GPIO=y
 UBOOT_OPTIONS+=		CONFIG_VIDEO=y
diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
index 57c8b2f4cd4..b1d0d446e45 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2018/12/19 12:03:01 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2018/12/31 15:06:44 jmcneill Exp $
 
 SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
@@ -11,5 +11,6 @@ SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55
 SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
 SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4
 SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
+SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe
 SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
 SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042
diff --git a/sysutils/u-boot/patches/patch-include_image.h b/sysutils/u-boot/patches/patch-include_image.h
new file mode 100644
index 00000000000..47479792ad8
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-include_image.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-include_image.h,v 1.1 2018/12/31 15:06:44 jmcneill Exp $
+
+IH_TYPE_* image type value compatibility was broken in 2018.11. Restore
+compatibility with previous and future releases. This has since been fixed
+upstream with commit 24431adc366c67c7755c0c6a956978f3b66ad550
+
+--- include/image.h.orig	2018-11-14 16:10:06.000000000 +0000
++++ include/image.h
+@@ -251,7 +251,6 @@ enum {
+ 	IH_TYPE_FLATDT,			/* Binary Flat Device Tree Blob	*/
+ 	IH_TYPE_KWBIMAGE,		/* Kirkwood Boot Image		*/
+ 	IH_TYPE_IMXIMAGE,		/* Freescale IMXBoot Image	*/
+-	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
+ 	IH_TYPE_UBLIMAGE,		/* Davinci UBL Image		*/
+ 	IH_TYPE_OMAPIMAGE,		/* TI OMAP Config Header Image	*/
+ 	IH_TYPE_AISIMAGE,		/* TI Davinci AIS Image		*/
+@@ -278,6 +277,9 @@ enum {
+ 	IH_TYPE_PMMC,            /* TI Power Management Micro-Controller Firmware */
+ 	IH_TYPE_STM32IMAGE,		/* STMicroelectronics STM32 Image */
+ 	IH_TYPE_SOCFPGAIMAGE_V1,	/* Altera SOCFPGA A10 Preloader	*/
++	IH_TYPE_MTKIMAGE,		/* MediaTek BootRO loadable Image */
++	IH_TYPE_IMX8MIMAGE,		/* Freescale IMX8MBoot Image	*/
++	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
+ 
+ 	IH_TYPE_COUNT,			/* Number of image types */
+ };