u-boot: update to 2017.09

6 files changed, 15 insertions, 21 deletions

diff --git a/sysutils/u-boot-jetson-tx1/Makefile b/sysutils/u-boot-jetson-tx1/Makefile
index 56ece26b316..f5aec08730c 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/23 17:33:12 jmcneill Exp $
-
-PKGREVISION=		1
+# $NetBSD: Makefile,v 1.3 2017/10/08 12:09:43 jmcneill Exp $
 
 UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
diff --git a/sysutils/u-boot-orangepi-2/Makefile b/sysutils/u-boot-orangepi-2/Makefile
index f71c2df712a..19bf6ea09fb 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/02 17:45:10 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2017/10/08 12:09:43 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-plus2e/Makefile b/sysutils/u-boot-orangepi-plus2e/Makefile
index 3aa95269e7a..3ceb948a25b 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/02 17:38:15 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2017/10/08 12:09:43 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/distinfo b/sysutils/u-boot/distinfo
index 45cecb35338..43d2a149934 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2017/09/23 17:33:12 jmcneill Exp $
+$NetBSD: distinfo,v 1.7 2017/10/08 12:09:42 jmcneill Exp $
 
-SHA1 (u-boot-2017.07.tar.bz2) = 517c33f41e2969f3b5b88e9ae3c042acfe1bde05
-RMD160 (u-boot-2017.07.tar.bz2) = b0d83a55b6daabdec28d85fdfb814a529c8d5eb9
-SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95
-Size (u-boot-2017.07.tar.bz2) = 11282262 bytes
+SHA1 (u-boot-2017.09.tar.bz2) = 2f732d626b4d158bd1932bee8f710efd55acf809
+RMD160 (u-boot-2017.09.tar.bz2) = 05db5aa883dfa8630d746c71d45d4a73f0ef4ee5
+SHA512 (u-boot-2017.09.tar.bz2) = dff6e793f135e7d6cb9d85d6ef8e4aa7ed5c1e20eece4f434e8c0a6039eb75c3f2cb7bc550121b1f5a5709e943c7cc5d6d8590e05a47a6b0d0d8f05185fe7ec6
+Size (u-boot-2017.09.tar.bz2) = 11434323 bytes
 SHA1 (patch-Kconfig) = 7e572929f220af5af6e709fc9493d0aa17bfbea1
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
 SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = 0e1ff9965703ef18c5e6a54a858217ad99617ea6
 SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac
 SHA1 (patch-include_configs_tegra-common.h) = 01b68620414f85edd029e54f7f8dc158888c4072
-SHA1 (patch-lib_bch.c) = 2e20f6d65a736b474859ef3ee840aae05452c6f4
+SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
 SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19
diff --git a/sysutils/u-boot/patches/patch-lib_bch.c b/sysutils/u-boot/patches/patch-lib_bch.c
index 6ef08b682bf..e2b3484a821 100644
--- a/sysutils/u-boot/patches/patch-lib_bch.c
+++ b/sysutils/u-boot/patches/patch-lib_bch.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_bch.c,v 1.2 2017/09/18 23:07:49 jmcneill Exp $
+$NetBSD: patch-lib_bch.c,v 1.3 2017/10/08 12:09:43 jmcneill Exp $
 
---- lib/bch.c.orig	2017-07-10 17:07:38.000000000 +0000
+--- lib/bch.c.orig	2017-09-11 18:10:40.000000000 +0000
 +++ lib/bch.c
 @@ -61,8 +61,10 @@
  #include <linux/bitops.h>
@@ -30,8 +30,8 @@ $NetBSD: patch-lib_bch.c,v 1.2 2017/09/18 23:07:49 jmcneill Exp $
  };
  
  #ifdef USE_HOSTCC
--#ifndef __BSD_VISIBLE
-+#if !defined(__BSD_VISIBLE) && !defined(__APPLE__)
+-#if !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
  static int fls(int x)
  {
  	int r = 32;
diff --git a/sysutils/u-boot/u-boot.mk b/sysutils/u-boot/u-boot.mk
index 4b2306da3e9..d7d7b6365cd 100644
--- a/sysutils/u-boot/u-boot.mk
+++ b/sysutils/u-boot/u-boot.mk
@@ -1,6 +1,6 @@
-# $NetBSD: u-boot.mk,v 1.4 2017/09/07 15:29:31 jmcneill Exp $
+# $NetBSD: u-boot.mk,v 1.5 2017/10/08 12:09:42 jmcneill Exp $
 
-UBOOT_VERSION?=	2017.07
+UBOOT_VERSION?=	2017.09
 PKGNAME=	u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 DISTNAME?=	u-boot-${UBOOT_VERSION}
 DISTINFO_FILE?=	${.CURDIR}/../../sysutils/u-boot/distinfo