u-boot: update to 2017.11

5 files changed, 7 insertions, 139 deletions

diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
index 43d2a149934..982136190c5 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.7 2017/10/08 12:09:42 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2017/11/15 22:08:27 jmcneill Exp $
 
-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 (u-boot-2017.11.tar.bz2) = 6a3932b39a0f165aba210663ea2500bcfb9c8794
+RMD160 (u-boot-2017.11.tar.bz2) = 38e1331640b81e74ea78ebf41f94bcdbd675dcb2
+SHA512 (u-boot-2017.11.tar.bz2) = 485b9ab7cea0a250d964822bdb99a8426852b4e815b506329dedc4f5a69757c8b1a812998561161d44d98f6fabb9c8937e8250de1244d258fc9f13624b38d643
+Size (u-boot-2017.11.tar.bz2) = 11982382 bytes
 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) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
 SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19
diff --git a/sysutils/u-boot/patches/patch-Kconfig b/sysutils/u-boot/patches/patch-Kconfig
deleted file mode 100644
index a66c36161df..00000000000
--- a/sysutils/u-boot/patches/patch-Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-Kconfig,v 1.1 2017/09/18 23:07:49 jmcneill Exp $
-
---- Kconfig.orig	2017-07-10 17:07:38.000000000 +0000
-+++ Kconfig
-@@ -367,5 +367,3 @@ source "fs/Kconfig"
- source "lib/Kconfig"
- 
- source "test/Kconfig"
--
--source "scripts/Kconfig"
diff --git a/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__de2.c b/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__de2.c
deleted file mode 100644
index cd3bc40304e..00000000000
--- a/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__de2.c
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-drivers_video_sunxi_sunxi__de2.c,v 1.1 2017/09/02 17:38:15 jmcneill Exp $
-
-sunxi: setup simplefb for Allwinner DE2
-
-Obtained from https://patchwork.ozlabs.org/patch/759922/
-
---- drivers/video/sunxi/sunxi_de2.c.orig	2017-07-10 17:07:38.000000000 +0000
-+++ drivers/video/sunxi/sunxi_de2.c
-@@ -10,6 +10,8 @@
- #include <display.h>
- #include <dm.h>
- #include <edid.h>
-+#include <fdtdec.h>
-+#include <fdt_support.h>
- #include <video.h>
- #include <asm/global_data.h>
- #include <asm/io.h>
-@@ -292,3 +294,82 @@ U_BOOT_DRIVER(sunxi_de2) = {
- U_BOOT_DEVICE(sunxi_de2) = {
- 	.name = "sunxi_de2"
- };
-+
-+/*
-+ * Simplefb support.
-+ */
-+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_VIDEO_DT_SIMPLEFB)
-+int sunxi_simplefb_setup(void *blob)
-+{
-+	struct udevice *de2, *hdmi;
-+	struct video_priv *de2_priv;
-+	struct video_uc_platdata *de2_plat;
-+	int mux;
-+	int offset, ret;
-+	u64 start, size;
-+	const char *pipeline = NULL;
-+
-+	debug("Setting up simplefb\n");
-+
-+	if (IS_ENABLED(CONFIG_MACH_SUNXI_H3_H5))
-+		mux = 0;
-+	else
-+		mux = 1;
-+
-+	/* Skip simplefb setting if DE2 / HDMI is not present */
-+	ret = uclass_find_device_by_name(UCLASS_VIDEO,
-+					 "sunxi_de2", &de2);
-+	if (ret) {
-+		debug("DE2 not present\n");
-+		return 0;
-+	}
-+
-+	ret = uclass_find_device_by_name(UCLASS_DISPLAY,
-+					 "sunxi_dw_hdmi", &hdmi);
-+	if (ret) {
-+		debug("HDMI not present\n");
-+		return 0;
-+	}
-+
-+	if (mux == 0)
-+		pipeline = "mixer0-lcd0-hdmi";
-+	else
-+		pipeline = "mixer1-lcd1-hdmi";
-+
-+	de2_priv = dev_get_uclass_priv(de2);
-+	de2_plat = dev_get_uclass_platdata(de2);
-+
-+	/* Find a prefilled simpefb node, matching out pipeline config */
-+	offset = fdt_node_offset_by_compatible(blob, -1,
-+					       "allwinner,simple-framebuffer");
-+	while (offset >= 0) {
-+		ret = fdt_stringlist_search(blob, offset, "allwinner,pipeline",
-+					    pipeline);
-+		if (ret == 0)
-+			break;
-+		offset = fdt_node_offset_by_compatible(blob, offset,
-+					       "allwinner,simple-framebuffer");
-+	}
-+	if (offset < 0) {
-+		eprintf("Cannot setup simplefb: node not found\n");
-+		return 0; /* Keep older kernels working */
-+	}
-+
-+	start = gd->bd->bi_dram[0].start;
-+	size = de2_plat->base - start;
-+	ret = fdt_fixup_memory_banks(blob, &start, &size, 1);
-+	if (ret) {
-+		eprintf("Cannot setup simplefb: Error reserving memory\n");
-+		return ret;
-+	}
-+
-+	ret = fdt_setup_simplefb_node(blob, offset, de2_plat->base,
-+			de2_priv->xsize, de2_priv->ysize,
-+			(1 << de2_priv->bpix) / 8 * de2_priv->xsize,
-+			"x8r8g8b8");
-+	if (ret)
-+		eprintf("Cannot setup simplefb: Error setting properties\n");
-+
-+	return ret;
-+}
-+#endif /* CONFIG_OF_BOARD_SETUP && CONFIG_VIDEO_DT_SIMPLEFB */
diff --git a/sysutils/u-boot/patches/patch-include_configs_sunxi-common.h b/sysutils/u-boot/patches/patch-include_configs_sunxi-common.h
deleted file mode 100644
index 83c3a9c6d9b..00000000000
--- a/sysutils/u-boot/patches/patch-include_configs_sunxi-common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-include_configs_sunxi-common.h,v 1.1 2017/09/02 17:38:15 jmcneill Exp $
-
-sunxi: setup simplefb for Allwinner DE2
-
-Obtained from https://patchwork.ozlabs.org/patch/759922/
-
---- include/configs/sunxi-common.h.orig	2017-07-10 17:07:38.000000000 +0000
-+++ include/configs/sunxi-common.h
-@@ -293,6 +293,10 @@ extern int soft_i2c_gpio_scl;
- 
- #endif /* CONFIG_VIDEO */
- 
-+#ifdef CONFIG_VIDEO_DE2
-+#define CONFIG_VIDEO_DT_SIMPLEFB
-+#endif
-+
- /* Ethernet support */
- #ifdef CONFIG_SUNXI_EMAC
- #define CONFIG_PHY_ADDR		1
diff --git a/sysutils/u-boot/u-boot.mk b/sysutils/u-boot/u-boot.mk
index 4bd46c5d54a..db8b2896efd 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.6 2017/10/09 08:45:03 wiz Exp $
+# $NetBSD: u-boot.mk,v 1.7 2017/11/15 22:08:27 jmcneill Exp $
 
-UBOOT_VERSION?=	2017.09
+UBOOT_VERSION?=	2017.11
 PKGNAME=	u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 DISTNAME?=	u-boot-${UBOOT_VERSION}
 DISTINFO_FILE?=	${.CURDIR}/../../sysutils/u-boot/distinfo