u-boot-pinebook: update to 2018.01

8 files changed, 22 insertions, 152 deletions

diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index 45acc86bac1..228a2a0488a 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
 
-UBOOT_VERSION=		2017.09
+UBOOT_VERSION=		2018.01
 UBOOT_TARGET=		pinebook
 UBOOT_CONFIG=		pinebook_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
@@ -8,7 +8,7 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 # Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
 MASTER_SITES=		${MASTER_SITE_GITHUB:=anarsoul/}
 GITHUB_PROJECT=		u-boot-pine64
-GITHUB_TAG=		0e9350e3ff11c91eb6959d0d4589a4cc5e576e35
+GITHUB_TAG=		98b74f94efc0bfa40ff78785f99a8f0a1fb0110a
 DISTNAME=		u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 EXTRACT_SUFX=		.tar.gz
 
@@ -18,7 +18,7 @@ PKG_DEFAULT_OPTIONS+=	el1
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
 
-BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
+BUILD_DEPENDS+=		arm-trusted-firmware-sun50iw1p1>=20180111:../../sysutils/arm-trusted-firmware-sun50iw1p1
 
 post-build:
 	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot-pinebook/distinfo b/sysutils/u-boot-pinebook/distinfo
index 517264f5d6a..352ff863249 100644
--- a/sysutils/u-boot-pinebook/distinfo
+++ b/sysutils/u-boot-pinebook/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
 
-SHA1 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = aa152afc2ba083fdb7a9f86519489c59d84e2e47
-RMD160 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 7de7b4fd529a2e29f6d2b9848a5a7a34e4b4d754
-SHA512 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 40329433d72cd86f6d2a74fe83555f12316ea583b9b2ebafdaf7fe4149fd5f72ab36ee9a03a975980dddd62c28a8c09d71a59fb18ea482bb47acf3a4a69f768b
-Size (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 14828817 bytes
-SHA1 (patch-Kconfig) = 80318752f7e06220120c7bea2687b7c412cfe2e8
-SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
-SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = a64bd9d6fbe075d9d01d196cfca8658d9ecd4bd2
-SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac
-SHA1 (patch-lib_bch.c) = 264366742bcb364a017dfb1709a711492904a4e3
-SHA1 (patch-tools_Makefile) = 5b3d6d377a4bc1629fe76d458f266e19f63fd5d8
+SHA1 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = e2fc6b456b88acd23e9b70d92fb520602d2242c9
+RMD160 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 6057d6237829bca77269ce1cbf0a2ca86721545b
+SHA512 (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 14fa032f26f36ff96c0237be63785087b2dfb8ea4c6b0c90c3baa962ca2f03a6eb8403d503dda72544b7a464f3b7d50fb889e313a6d98ae9e7243596a55bee6a
+Size (u-boot-pinebook-2018.01-98b74f94efc0bfa40ff78785f99a8f0a1fb0110a.tar.gz) = 15350995 bytes
+SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 82dee7f627ba721ba3548b49569ee2491764d86a
+SHA1 (patch-include_configs_sunxi-common.h) = 175027c9d7c96104e52ef1833cff4c26e8ed2ac3
+SHA1 (patch-lib_bch.c) = 00a80689266d3ab8d2af862327e7c852220a0713
diff --git a/sysutils/u-boot-pinebook/patches/patch-Kconfig b/sysutils/u-boot-pinebook/patches/patch-Kconfig
deleted file mode 100644
index 9b8c0376eed..00000000000
--- a/sysutils/u-boot-pinebook/patches/patch-Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-Kconfig,v 1.1 2017/11/19 16:50:35 jmcneill Exp $
-
---- Kconfig.orig	2017-09-21 06:16:57.000000000 +0000
-+++ Kconfig
-@@ -398,5 +398,3 @@ source "fs/Kconfig"
- source "lib/Kconfig"
- 
- source "test/Kconfig"
--
--source "scripts/Kconfig"
diff --git a/sysutils/u-boot-pinebook/patches/patch-arch_arm_cpu_armv8_Kconfig b/sysutils/u-boot-pinebook/patches/patch-arch_arm_cpu_armv8_Kconfig
index b37137ac8e5..98ae7ac9ca4 100644
--- a/sysutils/u-boot-pinebook/patches/patch-arch_arm_cpu_armv8_Kconfig
+++ b/sysutils/u-boot-pinebook/patches/patch-arch_arm_cpu_armv8_Kconfig
@@ -1,8 +1,8 @@
-$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.2 2018/02/18 12:27:20 jmcneill Exp $
 
---- arch/arm/cpu/armv8/Kconfig.orig	2017-07-10 17:07:38.000000000 +0000
+--- arch/arm/cpu/armv8/Kconfig.orig	2018-01-23 06:50:34.000000000 +0000
 +++ arch/arm/cpu/armv8/Kconfig
-@@ -130,6 +130,10 @@ config ARMV8_PSCI_CPUS_PER_CLUSTER
+@@ -132,6 +132,10 @@ config ARMV8_PSCI_CPUS_PER_CLUSTER
  	  A value 0 or no definition of it works for single cluster system.
  	  System with multi-cluster should difine their own exact value.
  
diff --git a/sysutils/u-boot-pinebook/patches/patch-drivers_video_sunxi_sunxi__de2.c b/sysutils/u-boot-pinebook/patches/patch-drivers_video_sunxi_sunxi__de2.c
deleted file mode 100644
index 478c7e91b9a..00000000000
--- a/sysutils/u-boot-pinebook/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/10 17:00:41 jmcneill Exp $
-
-sunxi: setup simplefb for Allwinner DE2
-
-Obtained from https://patchwork.ozlabs.org/patch/759922/
-
---- drivers/video/sunxi/sunxi_de2.c.orig	2017-09-01 04:53:54.000000000 +0000
-+++ drivers/video/sunxi/sunxi_de2.c
-@@ -11,6 +11,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>
-@@ -310,3 +312,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_lcd", &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-pinebook/patches/patch-include_configs_sunxi-common.h b/sysutils/u-boot-pinebook/patches/patch-include_configs_sunxi-common.h
index fadf91d12d4..0a4df3529f8 100644
--- a/sysutils/u-boot-pinebook/patches/patch-include_configs_sunxi-common.h
+++ b/sysutils/u-boot-pinebook/patches/patch-include_configs_sunxi-common.h
@@ -1,19 +1,15 @@
-$NetBSD: patch-include_configs_sunxi-common.h,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+$NetBSD: patch-include_configs_sunxi-common.h,v 1.2 2018/02/18 12:27:20 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.orig	2018-01-23 06:50:34.000000000 +0000
 +++ include/configs/sunxi-common.h
-@@ -293,6 +293,10 @@ extern int soft_i2c_gpio_scl;
+@@ -284,6 +284,10 @@ extern int soft_i2c_gpio_scl;
  
- #endif /* CONFIG_VIDEO */
+ #endif /* CONFIG_VIDEO_SUNXI */
  
 +#ifdef CONFIG_VIDEO_DE2
 +#define CONFIG_VIDEO_DT_SIMPLEFB
 +#endif
 +
  /* Ethernet support */
- #ifdef CONFIG_SUNXI_EMAC
+ #ifdef CONFIG_SUN4I_EMAC
  #define CONFIG_PHY_ADDR		1
diff --git a/sysutils/u-boot-pinebook/patches/patch-lib_bch.c b/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
index cd571cb0cb9..1ea3e88b24a 100644
--- a/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
+++ b/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_bch.c,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
+$NetBSD: patch-lib_bch.c,v 1.3 2018/02/18 12:27:20 jmcneill Exp $
 
---- lib/bch.c.orig	2017-09-21 06:16:57.000000000 +0000
+--- lib/bch.c.orig	2018-01-23 06:50:34.000000000 +0000
 +++ lib/bch.c
 @@ -61,8 +61,11 @@
  #include <linux/bitops.h>
diff --git a/sysutils/u-boot-pinebook/patches/patch-tools_Makefile b/sysutils/u-boot-pinebook/patches/patch-tools_Makefile
deleted file mode 100644
index 3b37e598480..00000000000
--- a/sysutils/u-boot-pinebook/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2017/11/19 16:50:35 jmcneill Exp $
-
---- tools/Makefile.orig	2017-09-21 06:16:57.000000000 +0000
-+++ tools/Makefile
-@@ -69,7 +69,7 @@ LIBFDT_CSRCS := fdt.c fdt_ro.c fdt_wip.c
- # Fatal error: can't create build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o:
- #    No such file or directory
- # To fix this, use an absolute path.
--libfdt_tree := $(shell readlink -f $(srctree)/lib/libfdt)
-+libfdt_tree := $(realpath $(srctree)/lib/libfdt)
- 
- LIBFDT_SRCS := $(addprefix $(libfdt_tree)/, $(LIBFDT_CSRCS))
- LIBFDT_SWIG := $(addprefix $(libfdt_tree)/, pylibfdt/libfdt.i)