Update sunxi-tools to latest from Github. This adds support for SPL

version 2, required for U-Boot 2017.07.

6 files changed, 26 insertions, 102 deletions

diff --git a/sysutils/sunxi-tools/Makefile b/sysutils/sunxi-tools/Makefile
index 7791148f839..aabd8d88546 100644
--- a/sysutils/sunxi-tools/Makefile
+++ b/sysutils/sunxi-tools/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2015/10/25 09:05:23 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/23 13:57:30 jmcneill Exp $
 #
 
-VERSION=	20150915
+VERSION=	20170823
 DISTNAME=	sunxi-tools-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linux-sunxi/}
 GITHUB_PROJECT=	sunxi-tools
-GITHUB_TAG=	568c7a0e81fc5d52189710c6d832677aa8770b16
+GITHUB_TAG=	cd9e6099e8668f4aa25d3ffc71283c0b138af1b7
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://linux-sunxi.org/
@@ -16,21 +15,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake pkg-config
 
-INSTALLATION_DIRS=	bin libdata/sunxi-tools
-
-do-install:
-.for f in fexc fel pio bootinfo phoenix_info
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin/${f}
-.endfor
-.for f in bin2fex fex2bin
-	${LN} ${DESTDIR}${PREFIX}/bin/fexc ${DESTDIR}${PREFIX}/bin/${f}
-.endfor
-.for f in fel-gpio
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin/${f}
-.endfor
-.for f in fel-pio.bin fel-sdboot.sunxi ramboot.scr fel-pio.nm jtag-loop.sunxi ramboot.uboot-sh
-	${INSTALL_DATA} ${WRKSRC}/bin/${f} ${DESTDIR}${PREFIX}/libdata/sunxi-tools/${f}
-.endfor
+INSTALLATION_DIRS=	bin
 
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sunxi-tools/PLIST b/sysutils/sunxi-tools/PLIST
index c2f7416bab0..a06636917d8 100644
--- a/sysutils/sunxi-tools/PLIST
+++ b/sysutils/sunxi-tools/PLIST
@@ -1,15 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2015/10/25 09:05:23 bouyer Exp $
-bin/fexc
-bin/bin2fex
-bin/fex2bin
-bin/fel
-bin/fel-gpio
-bin/pio
-bin/bootinfo
-bin/phoenix_info
-libdata/sunxi-tools/fel-pio.bin
-libdata/sunxi-tools/fel-sdboot.sunxi
-libdata/sunxi-tools/ramboot.scr
-libdata/sunxi-tools/fel-pio.nm
-libdata/sunxi-tools/jtag-loop.sunxi
-libdata/sunxi-tools/ramboot.uboot-sh
+@comment $NetBSD: PLIST,v 1.3 2017/08/23 13:57:30 jmcneill Exp $
+bin/sunxi-fexc
+bin/sunxi-bootinfo
+bin/sunxi-fel
+bin/sunxi-nand-part
+bin/sunxi-pio
diff --git a/sysutils/sunxi-tools/distinfo b/sysutils/sunxi-tools/distinfo
index ff71c59f4f4..d65f60ced62 100644
--- a/sysutils/sunxi-tools/distinfo
+++ b/sysutils/sunxi-tools/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:32 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/08/23 13:57:30 jmcneill Exp $
 
-SHA1 (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 294576067bea1d7d1c66148870b1a4767881762b
-RMD160 (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 6e1318bfea20bd57c740e13b14b1059530df073f
-SHA512 (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 85f5c53a6d4a01e979a2765c48a01339623747efa00336c250e4589ce00a94a1ab644dea6da02c536da2871243a150f40fc44d0e42064e6fb9bc4df2428da02e
-Size (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 51232 bytes
-SHA1 (patch-Makefile) = e4e54571315dd6614ecab75321586dbecae89a06
-SHA1 (patch-include_endian_compat.h) = f2e6fd1305c25a9b34f26fe70ad223ec5156211b
-SHA1 (patch-phoenix_info.c) = 824a1237dd5652fdd336b1d09eac03f2d3db9209
+SHA1 (sunxi-tools-20170823-cd9e6099e8668f4aa25d3ffc71283c0b138af1b7.tar.gz) = 8ce2cea3e940ad743e16b3bf67079dc38ca63053
+RMD160 (sunxi-tools-20170823-cd9e6099e8668f4aa25d3ffc71283c0b138af1b7.tar.gz) = f4eca6914e7652fc2da287eda686fccda4bb9fe3
+SHA512 (sunxi-tools-20170823-cd9e6099e8668f4aa25d3ffc71283c0b138af1b7.tar.gz) = e9f17f035e8b18fda0d4194ad05bf207a9708fdd63c6767fb0ddf22c550b1137cc627c7679c634b4cf18d4ad90951e382de2757b527f799696ad1c2968dac640
+Size (sunxi-tools-20170823-cd9e6099e8668f4aa25d3ffc71283c0b138af1b7.tar.gz) = 96277 bytes
+SHA1 (patch-Makefile) = 03ebb9bf3d615ed5a3f3cca7bcb8b1e24d6090f4
diff --git a/sysutils/sunxi-tools/patches/patch-Makefile b/sysutils/sunxi-tools/patches/patch-Makefile
index 890f4f3350a..9b0acaf3758 100644
--- a/sysutils/sunxi-tools/patches/patch-Makefile
+++ b/sysutils/sunxi-tools/patches/patch-Makefile
@@ -1,27 +1,13 @@
-$NetBSD: patch-Makefile,v 1.2 2015/10/25 09:05:23 bouyer Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/08/23 13:57:30 jmcneill Exp $
 
---- Makefile.orig	2015-09-13 22:56:46.000000000 +0200
-+++ Makefile	2015-10-25 09:55:26.000000000 +0100
-@@ -18,11 +18,11 @@
+--- Makefile.orig	2017-08-15 03:34:41.000000000 +0000
++++ Makefile
+@@ -43,7 +43,7 @@ TOOLS = sunxi-fexc sunxi-bootinfo sunxi-
+ FEXC_LINKS = bin2fex fex2bin
  
- CC = gcc
- CFLAGS = -g -O0 -Wall -Wextra
--CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200112L
-+CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE
- CFLAGS += -Iinclude/
- 
- TOOLS = fexc bin2fex fex2bin bootinfo fel pio
--TOOLS += nand-part
-+#TOOLS += nand-part
- 
- MISC_TOOLS = phoenix_info
- 
-@@ -30,7 +30,7 @@
- 
- .PHONY: all clean
- 
--all: $(TOOLS)
-+all: $(TOOLS) $(MISC_TOOLS)
- 
- misc: $(MISC_TOOLS)
+ # Tools which are only useful on the target
+-TARGET_TOOLS = sunxi-meminfo
++#TARGET_TOOLS = sunxi-meminfo
  
+ # Misc tools (of more "exotic" nature) not part of our default build / install
+ MISC_TOOLS = phoenix_info sunxi-nand-image-builder
diff --git a/sysutils/sunxi-tools/patches/patch-include_endian_compat.h b/sysutils/sunxi-tools/patches/patch-include_endian_compat.h
deleted file mode 100644
index b131f3b5d8f..00000000000
--- a/sysutils/sunxi-tools/patches/patch-include_endian_compat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_endian_compat.h,v 1.2 2015/10/25 09:05:23 bouyer Exp $
-
---- include/endian_compat.h.orig	2015-10-01 16:09:19.000000000 +0200
-+++ include/endian_compat.h	2015-10-01 16:20:48.000000000 +0200
-@@ -29,6 +29,8 @@
- #define le32toh(x) CFSwapInt32LittleToHost(x)
- #define htole16(x) CFSwapInt16HostToLittle(x)
- #define le16toh(x) CFSwapInt16LittleToHost(x)
-+#elif defined(__NetBSD__)
-+#include <sys/endian.h>
- #else
- #include <endian.h>
- #endif
diff --git a/sysutils/sunxi-tools/patches/patch-phoenix_info.c b/sysutils/sunxi-tools/patches/patch-phoenix_info.c
deleted file mode 100644
index c2d89cdd78f..00000000000
--- a/sysutils/sunxi-tools/patches/patch-phoenix_info.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-phoenix_info.c,v 1.1 2015/10/25 09:05:23 bouyer Exp $
-fix uninitialised variable use
-
---- phoenix_info.c.orig	2015-10-24 23:20:32.000000000 +0200
-+++ phoenix_info.c	2015-10-24 23:22:06.000000000 +0200
-@@ -45,7 +45,7 @@
- {
- 	int l = strlen(dest) + 16;
- 	char outname[l];
--	FILE *out;
-+	FILE *out = NULL;
- 	char *buf = NULL;
- 	int ret = 0;
- 	snprintf(outname, l, dest, part);
-@@ -72,7 +72,7 @@
- _exit:
- 	if (buf)
- 		free(buf);
--	if (out != stdout)
-+	if (out != NULL && out != stdout)
- 		fclose(out);
- 	return ret;
- err: