From 737ab6c460be2cc61be263eb2771c4fcbd09f379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 15 Sep 2020 10:51:37 +0200
Subject: [PATCH] bananapi-uboot: fix xlint; fix + enable armv7l-musl

---
 srcpkgs/bananapi-uboot/patches/musl.patch | 42 +++++++++++++++++++++++
 srcpkgs/bananapi-uboot/template           | 12 +++----
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/bananapi-uboot/patches/musl.patch

diff --git a/srcpkgs/bananapi-uboot/patches/musl.patch b/srcpkgs/bananapi-uboot/patches/musl.patch
new file mode 100644
index 0000000000..3efa59142c
--- /dev/null
+++ b/srcpkgs/bananapi-uboot/patches/musl.patch
@@ -0,0 +1,42 @@
+--- include/image.h	2014-08-19 08:42:46.000000000 +0200
++++ include/image.h	2020-09-15 10:43:48.410147914 +0200
+@@ -19,6 +19,11 @@
+ #include "compiler.h"
+ #include <asm/byteorder.h>
+ 
++#if !defined(__GLIBC__)
++typedef unsigned long int ulong;
++typedef unsigned long int uintptr_t;
++#endif
++
+ /* Define this to avoid #ifdefs later on */
+ struct lmb;
+ 
+--- tools/mkimage.h	2014-08-19 08:42:46.000000000 +0200
++++ tools/mkimage.h	2020-09-15 10:46:44.221140904 +0200
+@@ -22,6 +22,11 @@
+ #include "fdt_host.h"
+ #include "imagetool.h"
+ 
++#if !defined(__GLIBC__)
++typedef unsigned long int ulong;
++typedef unsigned long int uintptr_t;
++#endif
++
+ #undef MKIMAGE_DEBUG
+ 
+ #ifdef MKIMAGE_DEBUG
+--- tools/proftool.c	2014-08-19 08:42:46.000000000 +0200
++++ tools/proftool.c	2020-09-15 10:48:28.212136757 +0200
+@@ -20,6 +20,11 @@
+ #include <compiler.h>
+ #include <trace.h>
+ 
++#if !defined(__GLIBC__)
++typedef unsigned long int ulong;
++typedef unsigned long int uintptr_t;
++#endif
++
+ #define MAX_LINE_LEN 500
+ 
+ enum {
diff --git a/srcpkgs/bananapi-uboot/template b/srcpkgs/bananapi-uboot/template
index fb54ccbe81..fabedf3d59 100644
--- a/srcpkgs/bananapi-uboot/template
+++ b/srcpkgs/bananapi-uboot/template
@@ -1,18 +1,18 @@
-# Template file for 'odroid-u2-uboot'
+# Template file for 'bananapi-uboot'
 pkgname=bananapi-uboot
 version=15.04
-revision=1
+revision=2
+wrksrc="u-boot-bananapi-bananian-v${version}"
 hostmakedepends="sunxi-tools uboot-mkimage"
 short_desc="Banana Pi uboot module"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/hardkernel/u-boot"
 distfiles="https://github.com/Bananian/u-boot-bananapi/archive/bananian-v${version}.tar.gz"
 checksum=8be162b0b8e85d3fbc2e14af3b71c4a204f4a9c63f6f13275f86629624c1d6a6
-wrksrc="u-boot-bananapi-bananian-v${version}"
 
 conf_files="/boot/uEnv.txt"
-archs="armv7l"
+archs="armv7l*"
 
 do_configure() {
 	# Create a dummy header file for gcc10 since include/linux/compiler-gcc.h
@@ -38,7 +38,7 @@ do_build() {
 }
 
 do_install() {
-	# Certain files in `files` directory *NEED* to be installed.
+	# Certain files in 'files' directory *NEED* to be installed.
 	# uEnv.txt: The boot configuration file, in pure text for readability.
 	# script.fex: Pure text board configuration, compiled to script.bin.
 	vmkdir boot