On Thu, Aug 24, 2017 at 09:53:10AM +0200, Patrick Wildt wrote:
> 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?
sure
>
> 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
> ++#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..4221b6686b0 100644
> --- a/sysutils/u-boot/pkg/PFRAG.aarch64
> +++ b/sysutils/u-boot/pkg/PFRAG.aarch64
> @@ -7,6 +7,12 @@ share/u-boot/bananapi_m64/u-boot-sunxi-with-spl.bin
> 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/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/
> share/u-boot/nanopi_neo2/sunxi-spl.bin
> share/u-boot/nanopi_neo2/u-boot
> diff --git a/sysutils/u-boot/pkg/PFRAG.arm b/sysutils/u-boot/pkg/PFRAG.arm
> index 77d1bd63dd2..b47ff15172c 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
> @@ -233,6 +238,11 @@ share/u-boot/tinker-rk3288/u-boot
> share/u-boot/tinker-rk3288/u-boot-with-spl.bin
> share/u-boot/tinker-rk3288/u-boot.bin
> share/u-boot/tinker-rk3288/u-boot.img
> +share/u-boot/turris_omnia/
> +share/u-boot/turris_omnia/u-boot
> +share/u-boot/turris_omnia/u-boot-spl.kwb
> +share/u-boot/turris_omnia/u-boot.bin
> +share/u-boot/turris_omnia/u-boot.img
> share/u-boot/udoo/
> share/u-boot/udoo/SPL
> share/u-boot/udoo/u-boot
