Re: u-boot: add marvell-based clearfog, espressobin and macchiatobin

On Thu, Aug 24, 2017 at 09:19:41AM +0200, Patrick Wildt wrote:
> On Thu, Aug 24, 2017 at 09:15:20AM +0200, Patrick Wildt wrote:
> > Hi,
> >
> > I'd like to add the 32-bit Clearfog and the 64-bit EspressoBin and
> > Macchiatobin to our u-boot package. While the Clearfog's u-boot-spl.kwb
> > can be flashed to an SD card right away (bs=512 seek=1), the u-boot
> > for the 64-bit boards needs to be part of a Marvell ATF build. On the
> > Pine64 it's the other way around, as the ATF binaries are included in
> > the u-boot build.
> >
> > ok?
> >
> > Patrick
>
> Immediately spotted _after_ sending the mail, of course, a line ordering
> issue in PFRAG.aarch64. Update version below.

jsg@ reminded me that we should build the Turris Omnia as well, which is
basically like a Clearfog, but not the same.

ok?

diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
index 9a79e1ac0d6..ef8cc77c15f 100644
--- a/sysutils/u-boot/Makefile
+++ b/sysutils/u-boot/Makefile
@@ -7,7 +7,7 @@ FLAVOR?= arm

COMMENT= U-Boot firmware
VERSION= 2017.09-rc2
-REVISION= 0
+REVISION= 1
DISTNAME= u-boot-${VERSION}
PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
FULLPKGNAME= ${PKGNAME}
@@ -58,6 +58,8 @@ SUNXI64=\
pine64_plus \
sopine_baseboard
BOARDS=\
+ mvebu_espressobin-88f3720 \
+ mvebu_mcbin-88f8040 \
rpi_3
.elif "${FLAVOR}" == "arm"
OMAP=\
@@ -110,9 +112,11 @@ BOARDS=\
${OMAP} \
${SUNXI} \
${IMX} \
+ clearfog \
rpi_2 \
rpi_3_32b \
tinker-rk3288 \
+ turris_omnia \
vexpress_ca15_tc2 \
vexpress_ca9x4
.endif
diff --git a/sysutils/u-boot/patches/patch-tools_kwbimage_c b/sysutils/u-boot/patches/patch-tools_kwbimage_c
new file mode 100644
index 00000000000..53d66e78ce9
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-tools_kwbimage_c
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: tools/kwbimage.c
+--- tools/kwbimage.c.orig
++++ tools/kwbimage.c
+@@ -17,6 +17,10 @@
+ #include <stdint.h>
+ #include "kwbimage.h"
+
++#ifndef EPROTO
++#define EPROTO EIO
++