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

[Patrick Wildt]

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

diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
index 9a79e1ac0d6..c6b9d0f6e5c 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,6 +112,7 @@ BOARDS=\
        ${OMAP} \
        ${SUNXI} \
        ${IMX} \
+       clearfog \
        rpi_2 \
        rpi_3_32b \
        tinker-rk3288 \
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
++#endif
++
+ #ifdef CONFIG_KWB_SECURE
+ #include <openssl/bn.h>
+ #include <openssl/rsa.h>
diff --git a/sysutils/u-boot/pkg/PFRAG.aarch64 
b/sysutils/u-boot/pkg/PFRAG.aarch64
index 23eb8c58f4f..d1cfe4148e2 100644
--- a/sysutils/u-boot/pkg/PFRAG.aarch64
+++ b/sysutils/u-boot/pkg/PFRAG.aarch64
@@ -8,6 +8,12 @@ share/u-boot/bananapi_m64/u-boot.bin
 share/u-boot/bananapi_m64/u-boot.img
 share/u-boot/bananapi_m64/u-boot.itb
 share/u-boot/nanopi_neo2/
+share/u-boot/mvebu_espressobin-88f3720/
+share/u-boot/mvebu_espressobin-88f3720/u-boot
+share/u-boot/mvebu_espressobin-88f3720/u-boot.bin
+share/u-boot/mvebu_mcbin-88f8040/
+share/u-boot/mvebu_mcbin-88f8040/u-boot
+share/u-boot/mvebu_mcbin-88f8040/u-boot.bin
 share/u-boot/nanopi_neo2/sunxi-spl.bin
 share/u-boot/nanopi_neo2/u-boot
 share/u-boot/nanopi_neo2/u-boot-sunxi-with-spl.bin
diff --git a/sysutils/u-boot/pkg/PFRAG.arm b/sysutils/u-boot/pkg/PFRAG.arm
index 77d1bd63dd2..8425d7ca6c8 100644
--- a/sysutils/u-boot/pkg/PFRAG.arm
+++ b/sysutils/u-boot/pkg/PFRAG.arm
@@ -131,6 +131,11 @@ share/u-boot/am57xx_evm/MLO
 share/u-boot/am57xx_evm/u-boot
 share/u-boot/am57xx_evm/u-boot.bin
 share/u-boot/am57xx_evm/u-boot.img
+share/u-boot/clearfog/
+share/u-boot/clearfog/u-boot
+share/u-boot/clearfog/u-boot-spl.kwb
+share/u-boot/clearfog/u-boot.bin
+share/u-boot/clearfog/u-boot.img
 share/u-boot/cm_fx6/
 share/u-boot/cm_fx6/SPL
 share/u-boot/cm_fx6/u-boot